From cee092e54160d58967ad57943ae34938a3c906e4 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Wed, 22 Feb 2023 08:32:50 -0500 Subject: [PATCH 1/2] build: use tretuna/sync-branches to sync alpha with master --- .github/workflows/sync-master-alpha.yml | 31 +++++++++++++++++++++++++ 1 file changed, 31 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..3895d06766 --- /dev/null +++ b/.github/workflows/sync-master-alpha.yml @@ -0,0 +1,31 @@ +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 }} + merge-method: squash From 62895e0012035aeb32e6ed4777766fcdd7ef1e5d Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Wed, 22 Feb 2023 09:14:43 -0500 Subject: [PATCH 2/2] build: use merge instead of squash on auto-merge --- .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 3895d06766..b7a008879e 100644 --- a/.github/workflows/sync-master-alpha.yml +++ b/.github/workflows/sync-master-alpha.yml @@ -28,4 +28,3 @@ jobs: with: token: ${{ secrets.requirements_bot_github_token }} pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }} - merge-method: squash