Merge pull request #2 from qld-gov-au/changelogCreator

Run changelog creator pr in publish loop
qld-gov-au · Jul 30, 2024 · 643862e · 643862e
2 parents a68ccc5 + ef6d00f
commit 643862e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/.github/bin/updateChangeLog.sh b/.github/bin/updateChangeLog.sh
@@ -0,0 +1,11 @@
+mkdir tmp
+pushd tmp
+curl -o git-chglog.tar.gz -L https://github.com/git-chglog/git-chglog/releases/download/v0.15.1/git-chglog_0.15.1_linux_amd64.tar.gz
+#curl -o git-chglog.tar.gz -L https://github.com/git-chglog/git-chglog/releases/download/v0.15.1/git-chglog_0.15.1_darwin_amd64.tar.gz
+tar -zxvf git-chglog.tar.gz
+cp ./git-chglog ../git-chglog
+popd
+rm -rf tmp
+chmod u+x git-chglog
+./git-chglog -o CHANGELOG.md
+rm git-chglog
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -224,6 +224,19 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           releaseversion: ${{ github.event.inputs.releaseversion }}
 
+      - name: Update Changelog
+        # https://github.com/git-chglog/git-chglog#getting-started
+        run: ./.github/bin/updateChangeLog.sh
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          commit-message: "Update changelog: ${{ github.event.inputs.releaseversion }}"
+          title: "Update Changelog ${{ github.event.inputs.releaseversion }}"
+          body: "Update changelog to reflect release changes: ${{ github.event.inputs.releaseversion }}"
+          branch: update-changelog
+          base: main
+
       - name: Publish - Skipped
         if: ${{ env.DO_DEPLOYMENT != 'true' }}
         run: |

diff --git a/.github/workflows/updateChangeLog.yml b/.github/workflows/updateChangeLog.yml
@@ -2,7 +2,7 @@ name: Update Changelog
 on:
   release:
     types:
-      - created
+      - published #only on human interactions, won't be done on github action triggers
   workflow_dispatch:
     inputs:
       description:
@@ -16,23 +16,13 @@ jobs:
           fetch-depth: 0
       - name: Update Changelog
         # https://github.com/git-chglog/git-chglog#getting-started
-        run: |
-          mkdir tmp
-          pushd tmp
-          curl -o git-chglog.tar.gz -L https://github.com/git-chglog/git-chglog/releases/download/v0.15.1/git-chglog_0.15.1_linux_amd64.tar.gz
-          #curl -o git-chglog.tar.gz -L https://github.com/git-chglog/git-chglog/releases/download/v0.15.1/git-chglog_0.15.1_darwin_amd64.tar.gz
-          tar -zxvf git-chglog.tar.gz
-          cp ./git-chglog ../git-chglog
-          popd
-          rm -rf tmp
-          chmod u+x git-chglog
-          ./git-chglog -o CHANGELOG.md
-          rm git-chglog
+        run: ./.github/bin/updateChangeLog.sh
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:
-          commit-message: update changelog
-          title: Update Changelog
-          body: Update changelog to reflect release changes
+          commit-message: "Update changelog"
+          title: "Update Changelog}"
+          body: "Update changelog to reflect release changes"
           branch: update-changelog
           base: main