cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 15:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix test branch parsing

Browse Source
This commit is contained in:
Jordan Brown
2020-12-07 16:12:14 -05:00
parent 3716c84664
commit d21143da4a
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs
+5 -20
View File
@@ -22,28 +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",
GitHubRef
};
const string TestRefEnvVar = "TGS4_GITHUB_REF";
var envVar = Environment.GetEnvironmentVariable(TestRefEnvVar);
string workingBranch = null;
foreach (var envVarName in branchSourceEnvVars)
if (!String.IsNullOrWhiteSpace(envVar))
{
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;
}
workingBranch = envVar;
Console.WriteLine($"TEST: Set working branch to '{workingBranch}' from env var '{TestRefEnvVar}'");
}
if (workingBranch == null)