mirror of
https://github.com/urbit/shrub.git
synced 2024-12-25 04:52:06 +03:00
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:
parent
6bcbbf8f1a
commit
a51d95d806
17
.github/workflows/merge-release.yml
vendored
Normal file
17
.github/workflows/merge-release.yml
vendored
Normal 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 }}
|
||||
|
Loading…
Reference in New Issue
Block a user