mirror of
https://github.com/urbit/shrub.git
synced 2024-12-25 13:04:17 +03:00
meta: activate adjusted merge workflow
This commit is contained in:
parent
60f67727fe
commit
67c57c98c5
4
.github/workflows/merge.yml
vendored
4
.github/workflows/merge.yml
vendored
@ -2,7 +2,7 @@ name: merge
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'jt/merge-via-bot'
|
||||
- 'master'
|
||||
jobs:
|
||||
merge-to-next-js:
|
||||
runs-on: ubuntu-latest
|
||||
@ -12,6 +12,6 @@ jobs:
|
||||
- uses: devmasx/merge-branch@v1.3.1
|
||||
with:
|
||||
type: now
|
||||
target_branch: jt/testo
|
||||
target_branch: release/next-js
|
||||
github_token: ${{ secrets.JANEWAY_BOT_TOKEN }}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user