meta: add merge action

This commit is contained in:
Jared Tobin 2021-01-06 20:25:02 +04:00
parent eae48b76c6
commit 169908a1a4
No known key found for this signature in database
GPG Key ID: B77DC7C964AAD99A

View File

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