From 0f703335dd2a30114db9745313840fd0dab3d05a Mon Sep 17 00:00:00 2001
From: Niall Quinn <niall@primer.io>
Date: Thu, 30 Nov 2023 17:31:46 +0100
Subject: [PATCH 1/2] Create Github Release

---
 .github/workflows/post-release-merge.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/post-release-merge.yml b/.github/workflows/post-release-merge.yml
index 1f50c10..a118c04 100644
--- a/.github/workflows/post-release-merge.yml
+++ b/.github/workflows/post-release-merge.yml
@@ -1,14 +1,12 @@
-name: Post PR Merge
+name: Post Release PR Merge
 
-on: 
+on:
   pull_request:
-    branches:
-      - release/next
     types: [ closed ]
 
 jobs:
   release_merge:
-    if: github.event.pull_request.merged == true
+    if: github.head_ref == 'release/next' && github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - name: Git - Checkout
@@ -25,9 +23,12 @@ jobs:
         run: |
           git tag $RELEASE_VERSION
           git push origin $RELEASE_VERSION
-      - name: Create a Release
-        uses: elgohr/Github-Release-Action@v4
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_ACCESS_TOKEN }}
+      - name: Record changelog for current release
+        run: cz changelog $RELEASE_VERSION --file-name="release.md"
+      - name: Create release
+        uses: ncipollo/release-action@v1
         with:
           title: Release ${{ env.RELEASE_VERSION }}
+          name: "Release ${{ env.RELEASE_VERSION }}"
+          tag: ${{ env.RELEASE_VERSION }}
+          bodyFile: "release.md"

From 320257232a3141c9cd1601d464fcbc314b28f61d Mon Sep 17 00:00:00 2001
From: Niall Quinn <niall@primer.io>
Date: Fri, 1 Dec 2023 10:53:34 +0100
Subject: [PATCH 2/2] Remove title

---
 .github/workflows/post-release-merge.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/post-release-merge.yml b/.github/workflows/post-release-merge.yml
index a118c04..1fa54f7 100644
--- a/.github/workflows/post-release-merge.yml
+++ b/.github/workflows/post-release-merge.yml
@@ -28,7 +28,6 @@ jobs:
       - name: Create release
         uses: ncipollo/release-action@v1
         with:
-          title: Release ${{ env.RELEASE_VERSION }}
           name: "Release ${{ env.RELEASE_VERSION }}"
           tag: ${{ env.RELEASE_VERSION }}
           bodyFile: "release.md"