From f3c0656c68312a78aa133d5957b78e81cc5fa495 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <agstanki@gmail.com>
Date: Wed, 22 Feb 2023 09:32:08 -0500
Subject: [PATCH 1/3] build: use tretuna/sync-branches to sync alpha with
 master (#2071)

* build: use tretuna/sync-branches to sync alpha with master

* build: use merge instead of squash on auto-merge
---
 .github/workflows/sync-master-alpha.yml | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/sync-master-alpha.yml

diff --git a/.github/workflows/sync-master-alpha.yml b/.github/workflows/sync-master-alpha.yml
new file mode 100644
index 0000000000..b7a008879e
--- /dev/null
+++ b/.github/workflows/sync-master-alpha.yml
@@ -0,0 +1,30 @@
+name: Sync alpha with master
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  sync-branches:
+    runs-on: ubuntu-latest
+    name: Syncing branches
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18
+      - name: Create Pull Request
+        id: cpr
+        uses: tretuna/sync-branches@1.4.0
+        with:
+          GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }}
+          FROM_BRANCH: master
+          TO_BRANCH: alpha
+      - name: Enable Pull Request Automerge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v2
+        with:
+          token: ${{ secrets.requirements_bot_github_token }}
+          pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }}

From ae583bd60ae947e22aa979959aae02d3537c0440 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <agstanki@gmail.com>
Date: Wed, 22 Feb 2023 09:45:29 -0500
Subject: [PATCH 2/3] build: remove unnecessary conditional on enabling auto
 merge (#2075)

---
 .github/workflows/sync-master-alpha.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/sync-master-alpha.yml b/.github/workflows/sync-master-alpha.yml
index b7a008879e..c1169643ff 100644
--- a/.github/workflows/sync-master-alpha.yml
+++ b/.github/workflows/sync-master-alpha.yml
@@ -23,7 +23,6 @@ jobs:
           FROM_BRANCH: master
           TO_BRANCH: alpha
       - name: Enable Pull Request Automerge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
         uses: peter-evans/enable-pull-request-automerge@v2
         with:
           token: ${{ secrets.requirements_bot_github_token }}

From 16e2e6f64cba4b7c83c860a3a2567d847d1f67d2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <agstanki@gmail.com>
Date: Wed, 22 Feb 2023 09:58:43 -0500
Subject: [PATCH 3/3] build: allow manually dispatch sync alpha (#2078)

---
 .github/workflows/sync-master-alpha.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/sync-master-alpha.yml b/.github/workflows/sync-master-alpha.yml
index c1169643ff..36d39e2ece 100644
--- a/.github/workflows/sync-master-alpha.yml
+++ b/.github/workflows/sync-master-alpha.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   sync-branches: