Merge pull request #39 from joinmisskey/main

Release: 2024.7.0

.github/workflows/create-target.yml

@@ -33,11 +33,6 @@ on:
         description: 'App ID for app to create release'
       RELEASE_APP_PRIVATE_KEY:
         description: 'Private key for app to create release'
-      RULESET_EDIT_APP_ID:
-        description: 'App ID for app to edit rulesets'
-      RULESET_EDIT_APP_PRIVATE_KEY:
-        description: 'Private key for app to edit rulesets'
-
 permissions:
   contents: write
   issues: write

.github/workflows/merge.yml

@@ -33,10 +33,6 @@ on:
         description: 'App ID for app to create release'
       RELEASE_APP_PRIVATE_KEY:
         description: 'Private key for app to create release'
-      RULESET_EDIT_APP_ID:
-        description: 'App ID for app to edit rulesets'
-      RULESET_EDIT_APP_PRIVATE_KEY:
-        description: 'Private key for app to edit rulesets'
 
 permissions:
   contents: write
@@ -120,7 +116,7 @@ jobs:
       - name: Commit version
         run: |
           if [ -n "$(git status --porcelain)" ]; then
-            git commit -am "[skip ci] Release: $TARGET_VERSION"
+            git commit -am "Release: $TARGET_VERSION"
             git push
           fi
         env:

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

@@ -28,16 +28,19 @@ jobs:
         env:
           STABLE_BRANCH: ${{ vars.STABLE_BRANCH }}
       - name: Get target version
+        if: steps.get_pr.outputs.pr_number != ''
         uses: joinmisskey/release-actions/.github/actions/get-target-version@main
         id: v
       # CHANGELOG.mdの内容を取得
       - name: Get changelog
+        if: steps.get_pr.outputs.pr_number != ''
         uses: joinmisskey/release-actions/.github/actions/get-changelog@main
         with:
           version: ${{ steps.v.outputs.target_version }}
         id: changelog
       # PRのnotesを更新
       - name: Update PR
+        if: steps.get_pr.outputs.pr_number != ''
         run: |
           gh pr edit "$PR_NUMBER" --body "$CHANGELOG"
         env:

.github/workflows/release-with-dispatch.yml

@@ -68,8 +68,6 @@ jobs:
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-      RULESET_EDIT_APP_ID: ${{ secrets.RULESET_EDIT_APP_ID }}
-      RULESET_EDIT_APP_PRIVATE_KEY: ${{ secrets.RULESET_EDIT_APP_PRIVATE_KEY }}
 
   create-prerelease:
     uses: joinmisskey/release-actions/.github/workflows/create-prerelease.yml@main
@@ -127,5 +125,3 @@ jobs:
     secrets:
       RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
       RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-      RULESET_EDIT_APP_ID: ${{ secrets.RULESET_EDIT_APP_ID }}
-      RULESET_EDIT_APP_PRIVATE_KEY: ${{ secrets.RULESET_EDIT_APP_PRIVATE_KEY }}

CHANGELOG.md

@@ -1,6 +1,18 @@
 CHANGELOG
 =======================================
 
+## 2024.7.0
+
+### General
+- Fix aaa
+
+### Client
+- uuu
+
+### Server
+- ooo
+
+
 ## 2024.6.2
 
 ### General

README.md

@@ -69,9 +69,9 @@ To maintain the integrity of the stable branch, it is recommended that it prohib
 ## Repository secrets and variables
 ### Secrets
 <dl>
-<dt><code>RELEASE_APP_ID</code> <i>(optional)</i><</dt>
+<dt><code>RELEASE_APP_ID</code> <i>(optional)</i></dt>
 <dd>See "If you have `on: release` workflows..."</dd>
-<dt><code>RELEASE_APP_PRIVATE_KEY</code> <i>(optional)</i><</dt>
+<dt><code>RELEASE_APP_PRIVATE_KEY</code> <i>(optional)</i></dt>
 <dd>PEM cert. See "If you have `on: release` workflows..."</dd>
 </dl>
 

package.json

@@ -1,4 +1,4 @@
 {
   "name": "sandbox-actions-release",
-  "version": "2024.6.2"
+  "version": "2024.7.0"
 }

packages/misskey-js/package.json

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