From 657c546a662819fb49dcd384b36b6a1e5cd7eb77 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 25 Aug 2020 12:15:24 -0400
Subject: [PATCH] Actions shouldn't be this fucking hard...

---
 .github/workflows/ci-suite.yml                | 20 +++++++++----------
 .../Instance/RepositoryTest.cs                |  7 ++++++-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml
index 1d88b04ebe..06f161eb40 100644
--- a/.github/workflows/ci-suite.yml
+++ b/.github/workflows/ci-suite.yml
@@ -198,13 +198,13 @@ jobs:
       if: ${{ github.event_name == 'pull_request' }}
       run: echo "::set-env name=TGS4_TEST_PULL_REQUEST_NUMBER::${{ github.event.number }}"
 
-    - name: Set TGS4_TEST_BRANCH to pull request base
-      if: ${{ github.event_name == 'pull_request' }}
-      run: echo "::set-env name=TGS4_TEST_BRANCH::${{ github.event.base_ref.substring('refs/heads/'.length) }}"
+      - name: Set TGS4_GITHUB_REF for PR
+        if: ${{ github.event_name == 'pull_request' }}
+        run: echo "::set-env name=TGS4_GITHUB_REF::${{ github.event.base_ref }}"
 
-    - name: Set TGS4_TEST_BRANCH to pushed branch
-      if: ${{ github.event_name == 'push' }}
-      run: echo "::set-env name=TGS4_TEST_BRANCH::${{ github.event.ref.substring('refs/heads/'.length) }}"
+      - name: Set TGS4_GITHUB_REF for push
+        if: ${{ github.event_name == 'push' }}
+        run: echo "::set-env name=TGS4_GITHUB_REF::${{ github.event.ref }}"
 
     - name: Run Integration Test
       run: |
@@ -340,13 +340,13 @@ jobs:
       if: ${{ github.event_name == 'pull_request' }}
       run: echo "::set-env name=TGS4_TEST_PULL_REQUEST_NUMBER::${{ github.event.number }}"
 
-    - name: Set TGS4_TEST_BRANCH to pull request base
+    - name: Set TGS4_GITHUB_REF for PR
       if: ${{ github.event_name == 'pull_request' }}
-      run: echo "::set-env name=TGS4_TEST_BRANCH::${{ github.event.base_ref.substring('refs/heads/'.length - 1) }}"
+      run: echo "::set-env name=TGS4_GITHUB_REF::${{ github.event.base_ref }}"
 
-    - name: Set TGS4_TEST_BRANCH to pushed branch
+    - name: Set TGS4_GITHUB_REF for push
       if: ${{ github.event_name == 'push' }}
-      run: echo "::set-env name=TGS4_TEST_BRANCH::${{ github.event.ref.substring('refs/heads/'.length - 1) }}"
+      run: echo "::set-env name=TGS4_GITHUB_REF::${{ github.event.ref }}"
 
     - name: Run Integration Test
       run: |
diff --git a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs
index 9b27f2aa29..efd3e9a21e 100644
--- a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs
+++ b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs
@@ -22,11 +22,13 @@ namespace Tgstation.Server.Tests.Instance
 
 		public async Task RunPreWatchdog(CancellationToken cancellationToken)
 		{
+			const string GitHubRef = "TGS4_GITHUB_REF";
 			var branchSourceEnvVars = new List<string>
 			{
 				"TGS4_TEST_BRANCH",
 				"APPVEYOR_REPO_BRANCH",
-				"TRAVIS_BRANCH"
+				"TRAVIS_BRANCH",
+				GitHubRef
 			};
 
 			string workingBranch = null;
@@ -35,6 +37,9 @@ namespace Tgstation.Server.Tests.Instance
 				var envVar = Environment.GetEnvironmentVariable(envVarName);
 				if (!String.IsNullOrWhiteSpace(envVar))
 				{
+					if(envVarName == GitHubRef)
+						envVar = envVar.Substring("refs/heads/".Length);
+
 					workingBranch = envVar;
 					Console.WriteLine($"TEST: Set working branch to '{workingBranch}' from env var '{envVarName}'");
 					break;