Skip to content

Try explicit sbom enable #9639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wiktork merged 1 commit into from
Jul 16, 2026
+12 −8
Merged

Try explicit sbom enable #9639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions eng/pipelines/dotnet-monitor-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ resources:
extends:
template: /eng/pipelines/templates/pipeline-template.yml@self
parameters:
featureFlags:
sbomtoolkitPipelineRunnerGenerationEnabled: false
sbomtoolkitPipelineRunnerValidationEnabled: false
networkIsolationPolicy: Permissive
sdl:
sbom:
Expand Down
13 changes: 8 additions & 5 deletions eng/pipelines/stages/preparerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,19 @@ stages:
--client-id "$env:servicePrincipalId"
-v True

# SBOM generation is handled by 1ES PT at publish time: the 1ES.PublishPipelineArtifact
# task below auto-generates an SBOM (_manifest) over the published AssetsLayout, which
# includes the staged package. The previous explicit "Download SBOM Artifact" /
# "Copy SBOM to Assets Layout" steps relied on the per-job PackSignPublish_Pack_and_Sign_SBOM
# artifact, which Arcade no longer produces (SBOM moved to 1ES PT), causing the stage to fail.
# SBOM generation is handled by 1ES PT at publish time. Setting sbomEnabled: true on the
# 1ES.PublishPipelineArtifact task below makes 1ES generate an embedded _manifest SBOM over
# the published AssetsLayout (which includes the staged package). Downstream, the publish
# pipeline's release job validates this _manifest. The previous explicit "Download SBOM
# Artifact" / "Copy SBOM to Assets Layout" steps relied on the per-job
# PackSignPublish_Pack_and_Sign_SBOM artifact, which Arcade no longer produces (SBOM moved
# to 1ES PT).
- template: /eng/pipelines/steps/publish-pipeline-artifact.yml@self
parameters:
displayName: 'Upload Assets Layout'
targetPath: '$(System.ArtifactsDirectory)\AssetsLayout'
artifact: 'StagingToolAssetsLayout'
sbomEnabled: true
is1ESPipeline: ${{ parameters.is1ESPipeline }}

# Only tag build from real release branches
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/steps/publish-pipeline-artifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ parameters:
displayName: 'PublishPipelineArtifact'
targetPath: ''
artifact: ''
# When true, 1ES PT generates an embedded _manifest SBOM over the published artifact.
sbomEnabled: ''
# Adjust for 1ES pipeline template
is1ESPipeline: true

Expand All @@ -14,6 +16,8 @@ steps:
inputs:
targetPath: ${{ parameters.targetPath }}
artifact: ${{ parameters.artifact }}
${{ if ne(parameters.sbomEnabled, '') }}:
sbomEnabled: ${{ parameters.sbomEnabled }}
- ${{ else }}:
- task: PublishPipelineArtifact@1
displayName: ${{ parameters.displayName }}
Expand Down