build: another attempt to auto-sync changes from master to alpha (#2044)

openedx · Feb 20, 2023 · 7a9c4c5 · 7a9c4c5
1 parent 346e7a3
commit 7a9c4c5
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml
@@ -19,21 +19,16 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 18
-      - name: Sync changes
-        run: |
-          git switch alpha
-          git rebase master
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: tretuna/sync-branches@1
         with:
-          token: ${{ secrets.requirements_bot_github_token }}
-          branch: automation/sync-alpha-master
-          title: "chore(release): sync from master to alpha"
-          body: "Sync changes from `master` to `alpha`."
+          GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }}
+          FROM_BRANCH: "master"
+          TO_BRANCH: "alpha"
       - name: Enable Pull Request Auto Merge
         uses: peter-evans/enable-pull-request-automerge@v2
         with:
           token: ${{ secrets.requirements_bot_github_token }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
+          pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }}
           merge-method: squash