Add a step that will create a new PR when tag is bumped

Author: msmygit

.github/workflows/generate-changelog.yml

@@ -3,9 +3,11 @@ name: Generate Changelog PR
 
 # runs on
 # * pushing new tag with 'v' prefix
-# * manual trigger
+# * for 'main' branch
 on:
   push:
+    branches:
+      - main
     tags:
       - 'v*'
 
@@ -28,8 +30,10 @@ jobs:
       - name: Version bump PR
         uses: peter-evans/create-pull-request@v7
         with:
-          token: ${GITHUB_TOKEN}
+          token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Update changelog for a new version release"
           title: "Update changelog for a new version release"
           branch-suffix: "short-commit-hash"
-          base: "main"
+          base: "main"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -1,8 +1,13 @@
 # @author Madhavan Sridharan
 name: Publish to npm
 
+# runs on
+# * pushing new tag with 'v' prefix
+# * for 'main' branch
 on:
   push:
+    branches:
+      - main
     tags:
       - 'v*.*.*' # Trigger only on version tags like v1.0.0
 

.github/workflows/tag-release.yml

@@ -1,6 +1,8 @@
 # @author Madhavan Sridharan
-name: Prepare Version Tag
+name: Prepare new tag & changelog PR
 
+# runs on
+# * manually triggered
 on:
   workflow_dispatch:
     inputs:
@@ -14,13 +16,22 @@ on:
           - minor
           - major
 
+# global env vars, available in all jobs and steps
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 jobs:
-  tag:
+  new_tag_and_changelog:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
 
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
@@ -32,10 +43,48 @@ jobs:
           git config user.name "GitHub Actions"
           git config user.email "[email protected]"
 
-      - name: Create version bump branch
+      - name: Bump the tag version
         id: create_branch
+        # --no-git-tag-version ensures we control when tags are pushed
+        #  git fetch origin main
+        #  git checkout -b release/bump-tag-version origin/main
         run: |
-          git fetch origin main
-          git checkout -b release/bump-tag-version origin/main
           npm version ${{ github.event.inputs.release_type }} -m "chore(release): bump tag version to %s"
-          git push origin -u release/bump-tag-version --follow-tags
+        # --follow-tags is not used when pushing the branch in the next step since we're using --no-git-tag-version here
+
+      # - name: Commit version bump
+      #   run: |
+      #     git add package.json
+      #     git commit -m "chore(release): bump tag version to $(jq -r .version package.json)" || echo "No changes to commit"
+      #     git push origin release/bump-tag-version
+
+      # Duplicate
+      # - name: Configure Git credentials
+      #   run: |
+      #     git config --global url."https://github.com/".insteadOf "[email protected]:"
+      #     git config --global credential.helper store
+
+      # - name: Debug Git state
+      #   run: |
+      #     git remote -v
+      #     git branch
+      #     git config --list
+
+      - name: Generate changelog
+        continue-on-error: true
+        run: ./update_changelog.sh
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v7
+        env:
+          GITHUB_TOKEN:
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: "release/bump-tag-version"
+          #branch-suffix: "short-commit-hash"
+          base: "main"
+          title: "chore(release): Bump tag version and update changelog"
+          commit-message: "chore(release): Bump tag version and update changelog"
+          body: |
+            This pull request bumps the tag version to $(jq -r .version package.json) and updates changelog as part of the release process.
+            Please review and merge.