From 2b933ad37d3f28fb80cbaf7c426ce31ad34bc77a Mon Sep 17 00:00:00 2001
From: Airike Jaska <95303654+airikej@users.noreply.github.com>
Date: Fri, 31 Oct 2025 09:23:52 +0200
Subject: [PATCH 1/2] chore: merge main back to rc automatically after release
 #175

---
 .github/workflows/angular-release.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/angular-release.yml b/.github/workflows/angular-release.yml
index 9303b465e..b003c927b 100644
--- a/.github/workflows/angular-release.yml
+++ b/.github/workflows/angular-release.yml
@@ -84,3 +84,26 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPMJS_TEDI_AUTH_TOKEN }}
+
+  merge-back-to-rc:
+    needs: build-and-deploy
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: main
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Merge main into rc
+        run: |
+          git fetch origin rc
+          git checkout rc
+          git merge origin/main --no-edit || true
+          git push origin rc

From 0ea43755c42c6ef1bf48154dda1cd41598c45bd9 Mon Sep 17 00:00:00 2001
From: Airike Jaska <95303654+airikej@users.noreply.github.com>
Date: Fri, 31 Oct 2025 09:37:50 +0200
Subject: [PATCH 2/2] chore: fix job name #175

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

diff --git a/.github/workflows/angular-release.yml b/.github/workflows/angular-release.yml
index b003c927b..c76cf7552 100644
--- a/.github/workflows/angular-release.yml
+++ b/.github/workflows/angular-release.yml
@@ -85,7 +85,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPMJS_TEDI_AUTH_TOKEN }}
 
-  merge-back-to-rc:
+  merge-to-rc:
     needs: build-and-deploy
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest