mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-07-17 11:03:14 +01:00
Revert "Setup GitHub actions for V6 branch"
This reverts commit baa908f0b2.
This commit is contained in:
@@ -8,7 +8,6 @@ on:
|
||||
branches:
|
||||
- dev
|
||||
- master
|
||||
- V6
|
||||
|
||||
concurrency:
|
||||
group: "approve-dominion-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
|
||||
|
||||
@@ -25,18 +25,15 @@ on:
|
||||
branches:
|
||||
- dev
|
||||
- master
|
||||
- V6
|
||||
pull_request:
|
||||
branches:
|
||||
- dev
|
||||
- master
|
||||
- V6
|
||||
pull_request_target:
|
||||
types: [ opened, reopened, labeled, synchronize ]
|
||||
branches:
|
||||
- dev
|
||||
- master
|
||||
- V6
|
||||
|
||||
env:
|
||||
TGS_DOTNET_VERSION: 8
|
||||
|
||||
@@ -5,12 +5,10 @@ on:
|
||||
branches:
|
||||
- dev
|
||||
- master
|
||||
- V6
|
||||
pull_request:
|
||||
branches:
|
||||
- dev
|
||||
- master
|
||||
- V6
|
||||
|
||||
env:
|
||||
TGS_DOTNET_VERSION: 8
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
name: 'V6 Integration'
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- dev
|
||||
|
||||
jobs:
|
||||
v6-integration:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v1
|
||||
|
||||
- name: Merge dev into V6
|
||||
uses: robotology/gh-action-nightly-merge@22f5e45d028f22837d617fa07512925457eec184 #v1.3.3
|
||||
with:
|
||||
stable_branch: 'dev'
|
||||
development_branch: 'V6'
|
||||
allow_ff: true
|
||||
allow_forks: 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 }}
|
||||
Reference in New Issue
Block a user