From 4281a9633e9904c1cb47b16c6ce866ced79054e2 Mon Sep 17 00:00:00 2001
From: izumin5210 <m@izum.in>
Date: Mon, 13 Sep 2021 23:17:26 +0900
Subject: [PATCH] Update CHANGELOG on release PR

---
 .../create-release-and-publish/action.yml     | 23 -------------------
 .github/actions/generate-changelog/action.yml | 23 +++++++++++++++++++
 .github/workflows/publish.yml                 |  2 +-
 .github/workflows/release-pr.yml              |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/actions/create-release-and-publish/action.yml b/.github/actions/create-release-and-publish/action.yml
index db1283b..de2072f 100644
--- a/.github/actions/create-release-and-publish/action.yml
+++ b/.github/actions/create-release-and-publish/action.yml
@@ -21,29 +21,6 @@ runs:
       with:
         get-version: ${{ inputs.get-version }}
 
-    - name: Setup git
-      shell: bash
-      run: |
-        git config --global user.name 'github-actions[bot]'
-        git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-        git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}
-      env:
-        GITHUB_TOKEN: ${{ inputs.github-token }}
-
-    - name: Update CHANGELOG.md
-      shell: bash
-      run: |
-        mkdir -p tmp
-        echo "${RELEASE_NOTE}" > tmp/CHANGELOG.head.md
-        git show ${{ github.base_ref }}:./CHANGELOG.md > tmp/CHANGELOG.base.md
-        cat -s tmp/CHANGELOG.head.md tmp/CHANGELOG.base.md > CHANGELOG.md
-        git add CHANGELOG.md
-        git commit -m "Update CHANGELOG for ${RELEASE_TAG}"
-        git push
-      env:
-        RELEASE_TAG: ${{ steps.release-meta.outputs.tag }}
-        RELEASE_NOTE: ${{ steps.release-meta.outputs.note }}
-
     - name: Create GitHub Release
       uses: actions/github-script@v4
       with:
diff --git a/.github/actions/generate-changelog/action.yml b/.github/actions/generate-changelog/action.yml
index 889d49e..0b00769 100644
--- a/.github/actions/generate-changelog/action.yml
+++ b/.github/actions/generate-changelog/action.yml
@@ -28,3 +28,26 @@ runs:
       env:
         RELEASE_NOTE: ${{ steps.release-meta.outputs.note }}
         RELEASE_TAG: ${{ steps.release-meta.outputs.tag }}
+
+    - name: Setup git
+      shell: bash
+      run: |
+        git config --global user.name 'github-actions[bot]'
+        git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+        git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}
+      env:
+        GITHUB_TOKEN: ${{ inputs.github-token }}
+
+    - name: Update CHANGELOG.md
+      shell: bash
+      run: |
+        mkdir -p tmp
+        echo "${RELEASE_NOTE}" > tmp/CHANGELOG.head.md
+        git show ${{ github.event.pull_request.base.sha }}:./CHANGELOG.md > tmp/CHANGELOG.base.md
+        cat -s tmp/CHANGELOG.head.md tmp/CHANGELOG.base.md > CHANGELOG.md
+        git add CHANGELOG.md
+        git commit -m "Update CHANGELOG for ${RELEASE_TAG}"
+        git push
+      env:
+        RELEASE_TAG: ${{ steps.release-meta.outputs.tag }}
+        RELEASE_NOTE: ${{ steps.release-meta.outputs.note }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index cb0784b..2ae584a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ on:
     types: [closed]
 
 permissions:
-  contents: write
+  contents: read
   pull-requests: write
   packages: write
 
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
index 065ea9c..6a70b6b 100644
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -5,7 +5,7 @@ on:
     branches: [main]
 
 permissions:
-  contents: read
+  contents: write
   pull-requests: write
 
 jobs: