diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc1baba..20eca4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,11 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] + env: + TRUSTED_INGEST: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop') }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} steps: - name: Get the sources uses: actions/checkout@v7 @@ -45,11 +50,19 @@ jobs: with: user: ${{ secrets.NUGET_USER }} + - name: Azure login + if: ${{ env.TRUSTED_INGEST == 'true' && env.AZURE_CLIENT_ID != '' && env.AZURE_TENANT_ID != '' && env.AZURE_SUBSCRIPTION_ID != '' }} + uses: azure/login@v3 + with: + client-id: ${{ env.AZURE_CLIENT_ID }} + tenant-id: ${{ env.AZURE_TENANT_ID }} + subscription-id: ${{ env.AZURE_SUBSCRIPTION_ID }} + - name: Run Cake script uses: cake-build/cake-action@v3 env: - NuGetReportSettings_SharedKey: ${{ secrets.NUGETREPORTSETTINGS_SHAREDKEY }} - NuGetReportSettings_WorkspaceId: ${{ secrets.NUGETREPORTSETTINGS_WORKSPACEID }} + NuGetReportSettings_Endpoint: ${{ env.TRUSTED_INGEST == 'true' && secrets.NUGETREPORTSETTINGS_ENDPOINT || '' }} + NuGetReportSettings_RuleId: ${{ env.TRUSTED_INGEST == 'true' && secrets.NUGETREPORTSETTINGS_RULEID || '' }} GH_PACKAGES_NUGET_SOURCE: ${{ secrets.GH_PACKAGES_NUGET_SOURCE }} NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }} NUGET_APIKEY: ${{ steps.login.outputs.NUGET_API_KEY }} diff --git a/cake.cs b/cake.cs index d548c83..12b4490 100644 --- a/cake.cs +++ b/cake.cs @@ -8,7 +8,7 @@ *****************************/ Setup( static context => { - InstallTool("dotnet:https://api.nuget.org/v3/index.json?package=DPI&version=2026.10.15.520"); + InstallTool("dotnet:https://api.nuget.org/v3/index.json?package=DPI&version=2026.10.16.523"); InstallTool("dotnet:https://api.nuget.org/v3/index.json?package=GitVersion.Tool&version=6.7.0"); var assertedVersions = context.GitVersion(new GitVersionSettings { @@ -93,9 +93,17 @@ .AppendSwitchQuoted("--output", "table") .Append( ( - !string.IsNullOrWhiteSpace(context.EnvironmentVariable("NuGetReportSettings_SharedKey")) - && - !string.IsNullOrWhiteSpace(context.EnvironmentVariable("NuGetReportSettings_WorkspaceId")) +( + !string.IsNullOrWhiteSpace(context.EnvironmentVariable("NuGetReportSettings_Endpoint")) + && + !string.IsNullOrWhiteSpace(context.EnvironmentVariable("NuGetReportSettings_RuleId")) + ) + || + ( + !string.IsNullOrWhiteSpace(context.EnvironmentVariable("NuGetReportSettings_SharedKey")) + && + !string.IsNullOrWhiteSpace(context.EnvironmentVariable("NuGetReportSettings_WorkspaceId")) + ) ) ? "report" : "analyze"