From 5ae533b7f2bd227bc1a7f595c22db132ac6e1af9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 17 May 2024 13:55:27 -0700 Subject: [PATCH 1/2] Disable CG on PR builds --- .vsts-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 61a96f900..1f2d6b208 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -73,6 +73,9 @@ extends: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows + ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + componentgovernance: + ignoreDirectories: artifacts, .packages # Temporary to workaround MicroBuild issues. credscan: enabled: false From 42e75fad72954000bff89dfd5c68367fe38a3c0f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 4 Jun 2024 09:23:39 -0500 Subject: [PATCH 2/2] Use multiple processes for license scan (#19879) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index 72d71ef07..d6b4ba920 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -150,7 +150,7 @@ public class LicenseScanTests : TestBase string ignoreOptions = string.Join(" ", s_ignoredFilePatterns.Select(pattern => $"--ignore {pattern}")); ExecuteHelper.ExecuteProcessValidateExitCode( "scancode", - $"--license --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}", + $"--license --processes 4 --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}", OutputHelper); JsonDocument doc = JsonDocument.Parse(File.ReadAllText(scancodeResultsPath));