Update publish-1es-artifact.yml

Azure · Sep 12, 2024 · 59b3961 · 59b3961
1 parent 4d4ebae
commit 59b3961
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/eng/common/pipelines/templates/steps/publish-1es-artifact.yml b/eng/common/pipelines/templates/steps/publish-1es-artifact.yml
@@ -11,11 +11,7 @@ parameters:
   ArtifactName: ''
   ArtifactPath: ''
   CustomCondition: true
-  # Disable sbom generation by default for forked PR builds to avoid a bunch of warnings
-  ${{ if and(eq(variables['Build.Reason'],'PullRequest'), eq(variables['System.PullRequest.IsFork'], 'True')) }}:
-    SbomEnabled: false
-  ${{ else }}:
-    SbonEnabled: true
+  SbomEnabled: true
 
 steps:
   - pwsh: |
@@ -35,4 +31,6 @@ steps:
     inputs:
       artifactName: '$(PublishArtifactName)'
       targetPath: '${{ parameters.ArtifactPath }}'
-      sbomEnabled: ${{ parameters.SbomEnabled }}
+      # 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'))) }}:
+        sbomEnabled: ${{ parameters.SbomEnabled }}