From e64e1aa376ab999b4936ce180d3d9921c9f75c34 Mon Sep 17 00:00:00 2001
From: Raul Velaz <raul@radixdlt.com>
Date: Thu, 20 May 2021 14:17:55 +0200
Subject: [PATCH 1/2] fix release branch

---
 .github/workflows/publish-packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
index ccb99fd..91efebc 100644
--- a/.github/workflows/publish-packages.yml
+++ b/.github/workflows/publish-packages.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           default_bump: patch
           tag_prefix: ""
-          release_branches: ci/publish-packages
+          release_branches: main
           github_token: ${{ secrets.RADIXBOT_GITHUB_REPO_PACKAGES_TOKEN }}
   build:
     runs-on: ubuntu-latest

From 111b6a43e6bf990f8b5e60349d1022cb9eca393a Mon Sep 17 00:00:00 2001
From: Raul Velaz <raul@radixdlt.com>
Date: Thu, 20 May 2021 14:21:32 +0200
Subject: [PATCH 2/2] fix changelog

---
 .github/workflows/publish-packages.yml | 30 ++++++++++++++++----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
index 91efebc..6f983d1 100644
--- a/.github/workflows/publish-packages.yml
+++ b/.github/workflows/publish-packages.yml
@@ -6,8 +6,27 @@ on:
       - main
 
 jobs:
+  changelog:
+    name: Update changelog
+    runs-on: ubuntu-latest
+    steps:
+      - name: update changelog
+        uses: heinrichreimer/github-changelog-generator-action@v2.2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issues: true
+          issuesWoLabels: true
+          pullRequests: true
+          prWoLabels: true
+          unreleased: true
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update Changelog for PR
+          file_pattern: CHANGELOG.md
+
   version:
     name: Bump version and push tag
+    needs: changelog
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -48,17 +67,6 @@ jobs:
         uses: skjolber/maven-cache-github-action@v1
         with:
           step: save
-
-  changelog:
-    name: Update changelog
-    runs-on: ubuntu-latest
-    needs: version
-    steps:
-      - name: update changelog
-        uses: heinrichreimer/github-changelog-generator-action@v2.2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
   publish-npm:
     runs-on: ubuntu-latest
     needs: version