Release: 2024.6.0

.github/workflows/merge.yml

@@ -62,12 +62,20 @@ jobs:
         uses: joinmisskey/release-actions/.github/actions/get-target-version@main
         id: v
 
+      - uses: actions/create-github-app-token@v1
+        id: release-app-token
+        if: inputs.use_external_app_to_release
+        with:
+          app-id: ${{ secrets.RELEASE_APP_ID }}
+          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
+
       # mergeable: UNKNOWNを回避したい
       - name: 'Pre-fetch PR data'
         run: |
           gh pr view "$PR_NUMBER" --json mergeable
         env:
           PR_NUMBER: ${{ inputs.pr_number }}
+          GITHUB_TOKEN: ${{ inputs.use_external_app_to_release && steps.release-app-token.outputs.token || secrets.GITHUB_TOKEN }}
       - name: Sleep
         run: sleep 5s
 
@@ -77,6 +85,7 @@ jobs:
           echo "data=$(gh pr view "$PR_NUMBER" --json baseRefName,reviewDecision,isDraft,mergeStateStatus,statusCheckRollup,mergeable)" >> $GITHUB_OUTPUT
         env:
           PR_NUMBER: ${{ inputs.pr_number }}
+          GITHUB_TOKEN: ${{ inputs.use_external_app_to_release && steps.release-app-token.outputs.token || secrets.GITHUB_TOKEN }}
       - name: 'Check Mergeable: compare'
         uses: actions/script@v7
         env:
@@ -88,12 +97,12 @@ jobs:
               throw new Error('PR is draft');
             }
             if (pr.reviewDecision !== 'APPROVED') {
-              throw new Error(`reviewDecision is not APPROVED: ${pr.reviewDecision}`);
+              throw new Error(`reviewDecision is not APPROVED (${pr.reviewDecision}). You must approve the PR before merging.`);
             }
             if (pr.mergeable !== 'MERGEABLE') {
               throw new Error(`Not mergeable: ${pr.mergeable}`);
             }
-            if (pr.mergeStateStatus !== 'CLEAN') {
+            if (pr.mergeStateStatus !== 'CLEAN' && pr.mergeStateStatus !== 'BLOCKED') {
               throw new Error(`MergeStateStatus is not CLEAN: ${pr.mergeStateStatus}`);
             }
             if (pr.statusCheckRollup.find(s => s.conclusion !== 'SUCCESS')) {
@@ -132,12 +141,6 @@ jobs:
           TARGET_VERSION: ${{ steps.v.outputs.target_version }}
 
       # リリースを作成
-      - uses: actions/create-github-app-token@v1
-        id: release-app-token
-        if: inputs.use_external_app_to_release
-        with:
-          app-id: ${{ secrets.RELEASE_APP_ID }}
-          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
       - name: Create release
         env:
           GITHUB_TOKEN: ${{ inputs.use_external_app_to_release && steps.release-app-token.outputs.token || secrets.GITHUB_TOKEN }}
@@ -152,12 +155,13 @@ jobs:
         uses: prichey/retry@c92c7ba2f5f4d0b3b7b2b04cc5c6672f9c884a3f
         with:
           command: |
-            gh pr merge "$PR_NUMBER" --merge
+            gh pr merge "$PR_NUMBER" --merge --admin
           timeout_seconds: 30
           max_attempts: 3
           retry_wait_seconds: 5
         env:
           PR_NUMBER: ${{ inputs.pr_number }}
+          GITHUB_TOKEN: ${{ inputs.use_external_app_to_release && steps.release-app-token.outputs.token || secrets.GITHUB_TOKEN }}
 
       # CHANGELOG.mdにUnreleasedのテンプレートを追加
       - name: Prepend CHANGELOG template

.github/workflows/release-edit-with-push.yml

@@ -3,7 +3,7 @@ name: "Release Manager: sync changelog with PR"
 on:
   push:
     branches:
-      - develop
+      - main
     paths:
       - 'CHANGELOG.md'
 

CHANGELOG.md

@@ -1,6 +1,19 @@
 CHANGELOG
 =======================================
 
+## 2024.6.0
+
+### General
+- test
+- test2
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2024.5.6
 
 ### General

package.json

@@ -1,4 +1,4 @@
 {
   "name": "sandbox-actions-release",
-  "version": "2024.5.8"
+  "version": "2024.6.0"
 }

packages/misskey-js/package.json

@@ -1,4 +1,4 @@
 {
   "name": "sandbox-actions-release-misskey-js",
-  "version": "2024.5.8"
+  "version": "2024.6.0"
 }