fix: move changelog step to release-publish (Kong#7114)

* comment out changelog temporarily * move changelog to release-publish * fix
jackkav · Mar 13, 2024 · 511df3d · 511df3d
1 parent 2f403e8
commit 511df3d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -222,6 +222,16 @@ jobs:
         with:
           username: ${{ (github.event_name == 'workflow_dispatch' && github.actor) || 'insomnia-infra' }}
 
+      - name: Update CHANGELOG
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ secrets.RELEASE_GH_TOKEN }}
+          tag: ${{ env.RELEASE_CORE_TAG }}
+
+      - name: Git Commit Changelog
+        run: git commit -am "update CHANGELOG.md for ${{ env.RELEASE_VERSION }} [skip ci]"
+
       - name: Merge git branch into develop
         run: |
           remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"

diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml
@@ -102,16 +102,6 @@ jobs:
       - name: Git Commit
         run: git commit -am "Bump app version to ${{ env.RELEASE_VERSION }}"
 
-      - name: Update CHANGELOG
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          token: ${{ secrets.RELEASE_GH_TOKEN }}
-          tag: ${{ github.sha }}
-
-      - name: Git Commit Changelog
-        run: git commit -am "update CHANGELOG.md for ${{ env.RELEASE_VERSION }} [skip ci]"
-
       - name: Git Push changes
         run: |
           remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"