diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml new file mode 100644 index 0000000000..b90f34f17b --- /dev/null +++ b/.github/workflows/stable-merge.yml @@ -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 }}