[release/9.0] fix SBOM issues for runtime #113463
Merged
+8
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 9 commits
February 25, 2025 16:14
There was a problem hiding this comment.
Pull Request Overview
This PR addresses SBOM generation issues in the runtime repository. The changes disable SBOM generation at the job template level while explicitly adding a step to generate SBOM artifacts.
- Disabled SBOM generation by introducing the "enableSbom: false" flag.
- Added an explicit template invocation for generating SBOM artifacts.
Comments suppressed due to low confidence (1)
eng/pipelines/official/jobs/prepare-signed-artifacts.yml:13
- The 'enableSbom: false' flag disables SBOM generation at the job level, yet an explicit step later invokes SBOM generation. Please ensure that this configuration is intentional or adjust the logic so that these settings do not conflict.
enableSbom: false
|
Tagging subscribers to this area: @dotnet/area-meta |
hoyosjs
approved these changes
Mar 13, 2025
jeffschwMSFT
approved these changes
Mar 13, 2025
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/13846556831 |
|
@hoyosjs backporting to "release/8.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: update runtime repo to produce SBOM after signing artifacts
Using index info to reconstruct a base tree...
M eng/pipelines/official/jobs/prepare-signed-artifacts.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/official/jobs/prepare-signed-artifacts.yml
CONFLICT (content): Merge conflict in eng/pipelines/official/jobs/prepare-signed-artifacts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 update runtime repo to produce SBOM after signing artifacts
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes Issue dotnet/arcade#15562
Description
This PR solves the SBOM generation issue in the runtime repo