From 198cbe8549253e9d29d6f520aac15ef177bb7265 Mon Sep 17 00:00:00 2001 From: Amanjeev Sethi Date: Wed, 11 Jan 2023 14:21:06 -0500 Subject: [PATCH 1/2] gh action for merging main to master on pr merge --- .github/workflows/sync-master-from-main.yml | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/sync-master-from-main.yml diff --git a/.github/workflows/sync-master-from-main.yml b/.github/workflows/sync-master-from-main.yml new file mode 100644 index 0000000000..bfb7ebab0d --- /dev/null +++ b/.github/workflows/sync-master-from-main.yml @@ -0,0 +1,24 @@ +name: sync master from main + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + sync-branches: + runs-on: ubuntu-latest + name: Keep master and main in sync until master is done + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Merge master <- main + uses: devmasx/merge-branch@master + with: + type: now + from_branch: main + target_branch: master + github_token: ${{ secrets.GITHUB_TOKEN }} From a5fad18b5deec9c1acaa40bfcb57a16724a42cd8 Mon Sep 17 00:00:00 2001 From: Amanjeev Sethi Date: Wed, 11 Jan 2023 16:10:26 -0500 Subject: [PATCH 2/2] remove pull_request as trigger. only use push, that is after merging the pull_request --- .github/workflows/sync-master-from-main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/sync-master-from-main.yml b/.github/workflows/sync-master-from-main.yml index bfb7ebab0d..56142450ca 100644 --- a/.github/workflows/sync-master-from-main.yml +++ b/.github/workflows/sync-master-from-main.yml @@ -4,9 +4,6 @@ on: push: branches: - main - pull_request: - branches: - - main jobs: sync-branches: