From 5f2d1b97567e918e47b6766e30981057972b70e8 Mon Sep 17 00:00:00 2001
From: Timothy Le Bon <tlebon@gmail.com>
Date: Wed, 24 Jan 2024 15:16:35 +0100
Subject: [PATCH] chore: update release pipeline

---
 .../workflows/cherry-pick-release-to-dev.yml  | 29 +++++++++++++++++++
 .github/workflows/test_build_deploy.yml       |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 .github/workflows/cherry-pick-release-to-dev.yml

diff --git a/.github/workflows/cherry-pick-release-to-dev.yml b/.github/workflows/cherry-pick-release-to-dev.yml
new file mode 100644
index 0000000000..d4b96b6791
--- /dev/null
+++ b/.github/workflows/cherry-pick-release-to-dev.yml
@@ -0,0 +1,29 @@
+# This job will automatically create a cherry pick PR from any release/* branch to the staging branch
+# It allows the staging branch to stay up-to-date with fixes made to specific release branches
+name: Cherry pick to staging
+on:
+  push:
+    branches:
+      - release/*
+jobs:
+  cherry_pick:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Create PR to branch
+        uses: gorillio/github-action-cherry-pick@master
+        with:
+          pr_branch: 'staging'
+        env:
+          GITHUB_TOKEN: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }}
+
+      # Add the auto-merge flag
+      - name: Enable auto-merge
+        run: gh pr edit ${{ github.event.pull_request.id }} --add-label auto-merge
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.WEBTEAM_AUTOMERGE_TOKEN}}
diff --git a/.github/workflows/test_build_deploy.yml b/.github/workflows/test_build_deploy.yml
index 10aaf9ba1f..5fc6adbc44 100644
--- a/.github/workflows/test_build_deploy.yml
+++ b/.github/workflows/test_build_deploy.yml
@@ -74,6 +74,10 @@ jobs:
             wire_builds_target_branches='["dev"]'
           fi
 
+          if [ "$version_tag" == "release/q1-2024" ]; then
+          wire_builds_target_branches='["q1-2024"]'
+          fi
+
           echo "wire_builds_target_branches: $wire_builds_target_branches"
           echo "wire_builds_target_branches=$wire_builds_target_branches" >> $GITHUB_OUTPUT