Merge pull request #1588 from tgstation/V6Setup

Setup GitHub actions for V6 branch
This commit is contained in:
Jordan Dominion
2023-07-08 19:56:27 -04:00
committed by GitHub
4 changed files with 35 additions and 0 deletions
@@ -8,6 +8,7 @@ on:
branches:
- dev
- master
- V6
concurrency:
group: "approve-dominion-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
+3
View File
@@ -24,15 +24,18 @@ 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: 6.0.x
+2
View File
@@ -7,10 +7,12 @@ on:
branches:
- dev
- master
- V6
pull_request:
branches:
- dev
- master
- V6
concurrency:
group: "code-scanning-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
+29
View File
@@ -0,0 +1,29 @@
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 }}