Fix sbom generation in publish-build-assets.yml #14582
Merged
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
2 tasks
mmitche
reviewed
Mar 13, 2024
mmitche
approved these changes
Mar 13, 2024
chcosta
approved these changes
Mar 13, 2024
Contributor
Author
|
/backport to release/8.0 |
Contributor
Author
|
/backport to release/6.0 |
Contributor
|
Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/8285817524 |
Contributor
|
Started backporting to release/6.0: https://github.com/dotnet/arcade/actions/runs/8285819645 |
Contributor
|
@riarenas backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Use an intermediate directory for releaseConfigs publishing to fix sbom generation
Using index info to reconstruct a base tree...
M eng/common/templates-official/job/publish-build-assets.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/common/templates-official/job/publish-build-assets.yml
CONFLICT (content): Merge conflict in eng/common/templates-official/job/publish-build-assets.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use an intermediate directory for releaseConfigs publishing to fix sbom generation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@riarenas an error occurred while backporting to release/6.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Contributor
Author
It was a long shot anyways. |
1 task
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.
#14560
The pipeline templates expect a directory for their upload tasks instead of a file for the automatic scans to all succeed, so stick this file in its own directory and upload that.
Used my trusty symreader branch to test this fixes the error: https://dev.azure.com/dnceng/internal/_build/results?buildId=2403481&view=results
To double check: