From b3fefd3376323258d7ea08ec639e491c54f70290 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 25 Aug 2020 11:12:34 -0400 Subject: [PATCH] Improve integration test working branch detection --- .github/workflows/ci-suite.yml | 6 ++++ .../Instance/RepositoryTest.cs | 31 ++++++++++++++----- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index a29e637995..0d0fab1432 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -191,6 +191,9 @@ jobs: - name: Set TGS4_TEST_CONNECTION_STRING run: echo "::set-env name=TGS4_TEST_CONNECTION_STRING::Server=(localdb)\MSSQLLocalDB;Integrated Security=true;Initial Catalog=TGS_${{ matrix.watchdog-type }}_${{ matrix.configuration }};Application Name=tgstation-server" + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v2.x + - name: Checkout uses: actions/checkout@v1 @@ -325,6 +328,9 @@ jobs: if: ${{ matrix.watchdog-type == 'Basic' }} run: echo "::set-env name=General__UseBasicWatchdog::true" + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v2.x + - name: Checkout uses: actions/checkout@v1 diff --git a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs index b93f064557..bdf9ea172e 100644 --- a/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/RepositoryTest.cs @@ -22,14 +22,31 @@ namespace Tgstation.Server.Tests.Instance public async Task RunPreWatchdog(CancellationToken cancellationToken) { - // Clone ourselves - var workingBranch = Environment.GetEnvironmentVariable("TGS4_TEST_BRANCH"); - if (String.IsNullOrWhiteSpace(workingBranch)) - workingBranch = Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH"); - if (String.IsNullOrWhiteSpace(workingBranch)) - workingBranch = Environment.GetEnvironmentVariable("TRAVIS_BRANCH"); - if (String.IsNullOrWhiteSpace(workingBranch)) + var branchSourceEnvVars = new List + { + "TGS4_TEST_BRANCH", + "APPVEYOR_REPO_BRANCH", + "TRAVIS_BRANCH", + "GITHUB_BASE_REF_SLUG" + }; + + string workingBranch = null; + foreach (var envVarName in branchSourceEnvVars) + { + var envVar = Environment.GetEnvironmentVariable(envVarName); + if (!String.IsNullOrWhiteSpace(envVar)) + { + workingBranch = envVar; + Console.WriteLine($"TEST: Set working branch to '{workingBranch}' from env var '{envVarName}'"); + break; + } + } + + if (workingBranch == null) + { workingBranch = "master"; + Console.WriteLine($"TEST: Set working branch to default '{workingBranch}'"); + } var initalRepo = await repositoryClient.Read(cancellationToken); Assert.IsNotNull(initalRepo);