From cd4e7dd30ac159aa3ddb78ff4a6a30a02116e635 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 25 Apr 2025 12:17:55 -0700 Subject: [PATCH 1/3] Disable SBOM for public builds --- eng/common/pipelines/templates/steps/publish-1es-artifact.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml index 15663cce30..72f608ecc2 100644 --- a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml +++ b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml @@ -31,6 +31,6 @@ steps: inputs: artifactName: '$(PublishArtifactName)' targetPath: '${{ parameters.ArtifactPath }}' - # Disable sbom generation by default for forked PR builds to avoid a bunch of warnings - ${{ if not(and(eq(variables['Build.Reason'],'PullRequest'), eq(variables['System.PullRequest.IsFork'], 'True'))) }}: + # Disable sbom generation by default for our public validation builds to avoid unnecessary work + ${{ if eq(variables['System.TeamProject'], 'public') }}: sbomEnabled: ${{ parameters.SbomEnabled }} From de51bf759ae079b36f33d5bfbf14103dfd96a225 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 25 Apr 2025 12:19:18 -0700 Subject: [PATCH 2/3] Update publish-1es-artifact.yml --- eng/common/pipelines/templates/steps/publish-1es-artifact.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml index 72f608ecc2..9e95fd2f1e 100644 --- a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml +++ b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml @@ -33,4 +33,6 @@ steps: targetPath: '${{ parameters.ArtifactPath }}' # Disable sbom generation by default for our public validation builds to avoid unnecessary work ${{ if eq(variables['System.TeamProject'], 'public') }}: + sbomEnabled: false + ${{ else }} sbomEnabled: ${{ parameters.SbomEnabled }} From d1961f474e0424558aaca3af97261c004b25c68b Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 28 Apr 2025 12:38:12 -0700 Subject: [PATCH 3/3] Update publish-1es-artifact.yml --- eng/common/pipelines/templates/steps/publish-1es-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml index 9e95fd2f1e..81ade0f1a4 100644 --- a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml +++ b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml @@ -34,5 +34,5 @@ steps: # Disable sbom generation by default for our public validation builds to avoid unnecessary work ${{ if eq(variables['System.TeamProject'], 'public') }}: sbomEnabled: false - ${{ else }} + ${{ else }}: sbomEnabled: ${{ parameters.SbomEnabled }}