Add a workflow to automatically merge dev into V5

This commit is contained in:
Jordan Brown
2021-09-08 14:46:57 -04:00
parent 00ea3be924
commit a850d305a1
+28
View File
@@ -0,0 +1,28 @@
name: 'V5 Merge'
on:
push:
branches:
- dev
jobs:
master-merge:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Merge dev into V5
uses: robotology/gh-action-nightly-merge@v1.2.0
with:
stable_branch: 'dev'
development_branch: 'V5'
allow_ff: true
user_name: tgstation-server
user_email: tgstation-server@users.noreply.github.com
push_token: DEV_PUSH_TOKEN
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEV_PUSH_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }}