meta: adjust merge operations

Adds a 'merge-release' workflow that runs on any push to a release
branch.  At present the only job merges the triggering branch to
'ops-tlon'.

Also renames the 'merge' workflow to 'merge-master' to distinguish it
appropriately.
This commit is contained in:
Jared Tobin 2021-03-01 17:11:40 +04:00
parent 6bcbbf8f1a
commit a51d95d806
No known key found for this signature in database
GPG Key ID: B77DC7C964AAD99A
2 changed files with 17 additions and 0 deletions

17
.github/workflows/merge-release.yml vendored Normal file
View File

@ -0,0 +1,17 @@
name: ops-merge
on:
push:
branches:
- 'release/*'
jobs:
merge-release-to-ops:
runs-on: ubuntu-latest
name: "Merge to ops-tlon"
steps:
- uses: actions/checkout@v2
- uses: devmasx/merge-branch@v1.3.1
with:
type: now
target_branch: ops-tlon
github_token: ${{ secrets.JANEWAY_BOT_TOKEN }}