2021-01-06 18:52:13 +03:00
|
|
|
name: merge
|
|
|
|
|
on:
|
|
|
|
|
push:
|
|
|
|
|
branches:
|
2021-01-14 09:49:59 +03:00
|
|
|
- 'master'
|
2021-01-06 18:52:13 +03:00
|
|
|
jobs:
|
|
|
|
|
merge-to-next-js:
|
|
|
|
|
runs-on: ubuntu-latest
|
2021-05-11 23:10:12 +03:00
|
|
|
name: "Merge master to release/next-userspace"
|
2021-01-06 18:52:13 +03:00
|
|
|
steps:
|
|
|
|
|
- uses: actions/checkout@v2
|
|
|
|
|
- uses: devmasx/merge-branch@v1.3.1
|
|
|
|
|
with:
|
|
|
|
|
type: now
|
2021-05-11 23:10:12 +03:00
|
|
|
target_branch: release/next-userspace
|
2021-01-14 09:46:46 +03:00
|
|
|
github_token: ${{ secrets.JANEWAY_BOT_TOKEN }}
|
2021-01-06 18:52:13 +03:00
|
|
|
|
2021-02-26 04:58:38 +03:00
|
|
|
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 }}
|
