From c50e6aeb4aab9e646ecedd3984b495398a4259d1 Mon Sep 17 00:00:00 2001
From: Jack Kavanagh <jackkav@gmail.com>
Date: Tue, 12 Mar 2024 16:53:41 +0100
Subject: [PATCH] fix changelog (#7159)

* cool

* seperate changelog

* should be fine

---------

Co-authored-by: gatzjames <jamesgatzos@gmail.com>
---
 .github/workflows/changelog.yml       | 28 +++++++++++++++++++++++++++
 .github/workflows/release-build.yml   |  2 ++
 .github/workflows/release-publish.yml | 10 ----------
 .github/workflows/release-start.yml   |  2 +-
 4 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/changelog.yml

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 000000000..d82ef5498
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,28 @@
+name: Update changelog
+
+on:
+  push:
+    tags:
+      - core@(\d+\.\d+\.\d+)(?:-(alpha|beta)\.\d+)?
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Update CHANGELOG
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ secrets.RELEASE_GH_TOKEN }}
+          tag: ${{ github.ref_name }}
+
+      - name: Commit CHANGELOG.md
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: develop
+          commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
+          file_pattern: CHANGELOG.md
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index e4ffefb53..0f2893c5c 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -161,6 +161,8 @@ jobs:
         uses: kt3k/update-pr-description@v2.0.0
         with:
           pr_body: |
+            **WARNING: Do not merge this PR. This is an automated release PR. It should be released using the "Publish" workflow.**
+
             Download release artifacts [here](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
             ## Steps for Publish:
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 7602d4252..dab2715e6 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -222,16 +222,6 @@ 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
index bfd40db6f..91c6cf6b7 100644
--- a/.github/workflows/release-start.yml
+++ b/.github/workflows/release-start.yml
@@ -13,7 +13,7 @@ on:
         - stable
       version:
         required: false
-        description: force version of the release (e.g. 2022.1.0)
+        description: force version of the release (e.g. 9.0.0) leave blank to increment automatically
 
 jobs:
   setup-release-branch: