Add a workflow to merge master to dev

2026-08-30 16:39:21 +01:00 · 2020-03-28 12:24:55 -04:00
parent 5ce49dfb4d
commit 5c055dc727
1 changed files with 28 additions and 0 deletions
@@ -0,0 +1,28 @@
+name: 'Stable Merge'
+
+on:
+    push:
+      branches:
+        - master
+
+jobs:
+  nightly-merge:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Nightly Merge
+      uses: robotology/gh-action-nightly-merge@v1.2.0
+      with:
+        stable_branch: 'master'
+        development_branch: 'dev'
+        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 }}