add a flag to let users opt into serial builds of inner-RID containers#47455
Merged
baronfel merged 1 commit intodotnet:mainfrom Mar 11, 2025
Merged
Conversation
Member
|
Does this also avoid the issue in #47429? I'm not sure I'd want to use it, given the build perf impacts, but would be nice to know if it's also an escape hatch for this. |
Member
Author
|
@MattKotsenas I haven't looked enough to say with confidence - it does seem like a reasonable guess though. |
surayya-MS
approved these changes
Mar 11, 2025
Member
Author
|
/backport to release/9.0.3xx |
Contributor
|
Started backporting to release/9.0.3xx: https://github.com/dotnet/sdk/actions/runs/13796272852 |
Contributor
|
@baronfel backporting to "release/9.0.3xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: add a flag to let users opt into serial builds of inner-RID containers
Using index info to reconstruct a base tree...
M src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
Falling back to patching base and 3-way merge...
Auto-merging src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
CONFLICT (content): Merge conflict in src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
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 add a flag to let users opt into serial builds of inner-RID containers
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
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.
This adds a workaround for dotnet/sdk-container-builds#625.
It adds a containers-specific flag that lets users publish inner-RID containers in a serial manner.
If merged, we should backport to 9.0.3xx as well (and maybe 8.0.4xx if @MattKotsenas things they'll need it).