Generate changelog after pushing tag

department-of-veterans-affairs · Nov 28, 2023 · eca3060 · eca3060
1 parent 718fb46
commit eca3060
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -85,23 +85,25 @@ jobs:
 
           echo "NEW_VERSION=$NEW_VERSION" >> "$GITHUB_OUTPUT"
           echo "GIT_TAG=${{ inputs.package }}-v$NEW_VERSION" >> "$GITHUB_OUTPUT"
-      - name: Generate changelog
-        run: |
-          chmod +x ../../.github/scripts/generate-changelog.sh
-          ./../../.github/scripts/generate-changelog.sh ${{ inputs.package }} ${{ secrets.VA_MOBILE_ROBOT_GITHUB_PAT }}
       - name: Commit changes and tag
         run: |
           git config --global user.name 'VA Automation Bot'
           git config --global user.email '[email protected]'
           git pull
           git add package.json
-          git add CHANGELOG.md
           git commit -m 'Version bump: ${{ steps.bump-version.outputs.GIT_TAG }}'
           git push
           TAG=${{ steps.bump-version.outputs.GIT_TAG }}
           echo $TAG
           git tag -a $TAG -m $TAG
           git push origin $TAG
+      - name: Generate changelog
+        run: |
+          chmod +x ../../.github/scripts/generate-changelog.sh
+          ./../../.github/scripts/generate-changelog.sh ${{ inputs.package }} ${{ secrets.VA_MOBILE_ROBOT_GITHUB_PAT }}
+          git add CHANGELOG.md
+          git commit -m 'Changelog for ${{ steps.bump-version.outputs.GIT_TAG }}'
+          git push
       - name: Post to a Slack channel
         id: slack
         uses: slackapi/[email protected]