diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0d0765..1e86e58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,11 +40,11 @@ jobs: NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }} NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - AZURE_CONTAINER_REGISTRY: ${{ secrets.AZURE_CONTAINER_REGISTRY }} AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_AUTHORITY_HOST: "https://login.microsoftonline.com" + AZURE_DOMAIN: ${{ secrets.AZURE_DOMAIN }} with: cake-version: tool-manifest target: GitHub-Actions diff --git a/build.cake b/build.cake index 3c35c0e..1449dfd 100644 --- a/build.cake +++ b/build.cake @@ -190,10 +190,10 @@ Task("Clean") .WithCriteria((context, data) => data.ShouldRunIntegrationTests(), "ShouldRunIntegrationTests") .Does( async (context, data) => { - var resultPath = data.IntegrationTestPath.Combine(data.AzureTenantId); + var resultPath = data.IntegrationTestPath.Combine(data.AzureDomain); await GitHubActions.Commands.UploadArtifact( resultPath, - data.AzureTenantId + data.AzureDomain ); GitHubActions.Commands.SetStepSummary( string.Join( diff --git a/build/records.cake b/build/records.cake index ad93f2a..a7b6e4f 100644 --- a/build/records.cake +++ b/build/records.cake @@ -55,8 +55,9 @@ public record BuildData( ); public string AzureTenantId { get; } = System.Environment.GetEnvironmentVariable("AZURE_TENANT_ID"); + public string AzureDomain { get; } = System.Environment.GetEnvironmentVariable("AZURE_DOMAIN"); - public bool ShouldRunIntegrationTests() => !string.IsNullOrWhiteSpace(AzureTenantId) && + public bool ShouldRunIntegrationTests() => !string.IsNullOrWhiteSpace(AzureDomain) && ( AzureCredentials.AzureCredentialsSpecified || IsLocalBuild