From baa908f0b2858a09da16642f8dd44f4849a7d9e6 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 8 Jul 2023 14:08:18 -0400
Subject: [PATCH] Setup GitHub actions for V6 branch

---
 .../workflows/auto-approve-dominions-prs.yml  |  1 +
 .github/workflows/ci-pipeline.yml             |  3 ++
 .github/workflows/code-scanning.yml           |  2 ++
 .github/workflows/v6-integration.yml          | 29 +++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 .github/workflows/v6-integration.yml

diff --git a/.github/workflows/auto-approve-dominions-prs.yml b/.github/workflows/auto-approve-dominions-prs.yml
index cd499fffde..53546b6f66 100644
--- a/.github/workflows/auto-approve-dominions-prs.yml
+++ b/.github/workflows/auto-approve-dominions-prs.yml
@@ -8,6 +8,7 @@ on:
     branches:
     - dev
     - master
+    - V6
 
 concurrency:
   group: "approve-dominion-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 63469fe08d..2ee2296c9f 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -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
diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
index 8e130eddf4..36afb0999f 100644
--- a/.github/workflows/code-scanning.yml
+++ b/.github/workflows/code-scanning.yml
@@ -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 }}"
diff --git a/.github/workflows/v6-integration.yml b/.github/workflows/v6-integration.yml
new file mode 100644
index 0000000000..83be1561eb
--- /dev/null
+++ b/.github/workflows/v6-integration.yml
@@ -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 }}