meta: activate adjusted merge workflow

This commit is contained in:
Jared Tobin 2021-01-14 15:49:59 +09:00
parent 60f67727fe
commit 67c57c98c5

View File

@ -2,7 +2,7 @@ name: merge
on: on:
push: push:
branches: branches:
- 'jt/merge-via-bot' - 'master'
jobs: jobs:
merge-to-next-js: merge-to-next-js:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -12,6 +12,6 @@ jobs:
- uses: devmasx/merge-branch@v1.3.1 - uses: devmasx/merge-branch@v1.3.1
with: with:
type: now type: now
target_branch: jt/testo target_branch: release/next-js
github_token: ${{ secrets.JANEWAY_BOT_TOKEN }} github_token: ${{ secrets.JANEWAY_BOT_TOKEN }}