Merged
Conversation
Member
Author
|
/backport to release/9.0 |
Contributor
|
Started backporting to release/9.0: https://github.com/dotnet/arcade/actions/runs/13529811107 |
Member
Author
|
/backport to release/8.0 |
Contributor
|
Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/13529813530 |
Contributor
|
@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: Fixup sbom
Using index info to reconstruct a base tree...
A eng/common/core-templates/steps/generate-sbom.yml
M eng/common/templates-official/job/job.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/common/templates-official/steps/generate-sbom.yml
Auto-merging eng/common/templates-official/job/job.yml
CONFLICT (content): Merge conflict in eng/common/templates-official/job/job.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 Fixup sbom
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Member
Author
mmitche
reviewed
Feb 26, 2025
| parameters: | ||
| PackageVersion: ${{ parameters.packageVersion }} | ||
| BuildDropPath: ${{ parameters.buildDropPath }} | ||
| ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom |
Member
There was a problem hiding this comment.
This already appears to be the default value. What's the reason behind this?
Member
Author
There was a problem hiding this comment.
Just for readability. Line 66 assumes that this is the path that it gets published here, so I enforce that it exists at this level.
mmitche
approved these changes
Feb 26, 2025
epananth
approved these changes
Feb 26, 2025
This was referenced Mar 6, 2025
YuliiaKovalova
pushed a commit
that referenced
this pull request
Mar 20, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
1ES templates generates SBoM's for all artifacts uploaded - only issue is it does it in the root of the artifact that's uploaded inside the
_manifestfolder. If there's a manifest in the uploaded artifact, it will clobber the SBOM with an SBOM for the SBOM. The quick and dirty solution for now: generate the SBoM in a subdirectory of the upload root.