mirror of
https://github.com/urbit/shrub.git
synced 2024-12-25 04:52:06 +03:00
a51d95d806
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.
28 lines
686 B
YAML
28 lines
686 B
YAML
name: merge
|
|
on:
|
|
push:
|
|
branches:
|
|
- 'master'
|
|
jobs:
|
|
merge-to-next-js:
|
|
runs-on: ubuntu-latest
|
|
name: "Merge master to release/next-js"
|
|
steps:
|
|
- uses: actions/checkout@v2
|
|
- uses: devmasx/merge-branch@v1.3.1
|
|
with:
|
|
type: now
|
|
target_branch: release/next-js
|
|
github_token: ${{ secrets.JANEWAY_BOT_TOKEN }}
|
|
|
|
merge-to-group-timer:
|
|
runs-on: ubuntu-latest
|
|
name: "Merge master to ops/group-timer"
|
|
steps:
|
|
- uses: actions/checkout@v2
|
|
- uses: devmasx/merge-branch@v1.3.1
|
|
with:
|
|
type: now
|
|
target_branch: ops/group-timer
|
|
github_token: ${{ secrets.JANEWAY_BOT_TOKEN }}
|