diff options
author | Amanjeev Sethi <aj@amanjeev.com> | 2023-01-16 11:21:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-16 11:21:36 -0500 |
commit | 6322b2d9eb3bbc59408606e72dae270511eccec1 (patch) | |
tree | 04703950533166f0a0c05929684757d66df26abf | |
parent | ed2d06eae31e94022961ef4ed1d8c784b3bc00d4 (diff) |
Add trigger for push to `main` branch for sync'ing with `master` (#2387)
* gh action for merging main to master on pr merge
* remove pull_request as trigger. only use push, that is after merging the pull_request
-rw-r--r-- | .github/workflows/sync-master-from-main.yml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/.github/workflows/sync-master-from-main.yml b/.github/workflows/sync-master-from-main.yml new file mode 100644 index 00000000..56142450 --- /dev/null +++ b/.github/workflows/sync-master-from-main.yml @@ -0,0 +1,21 @@ +name: sync master from main + +on: + push: + 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 }} |