From 79a0458410c86cb6d64927b4fd77e4931f8e057c Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 15 Aug 2022 13:24:28 -0400 Subject: [PATCH] Delete v5-merge.yml --- .github/workflows/v5-merge.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/v5-merge.yml diff --git a/.github/workflows/v5-merge.yml b/.github/workflows/v5-merge.yml deleted file mode 100644 index 79227ffe94..0000000000 --- a/.github/workflows/v5-merge.yml +++ /dev/null @@ -1,28 +0,0 @@ -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 }}