-
Notifications
You must be signed in to change notification settings - Fork 377
Update microbuild to use PME service connection #15797
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.
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
Conversation
|
why is this a draft @hoyosjs❔ |
|
We should hold off merging until tactics discuss this - the impact is pretty heavy handed for end customer workflows and potentially breaks many workflows. At the very least it needs wide communication since it could end up with many pipelines created. |
|
@mmitche ^^ |
|
Does this have the right value for the DevDiv project? |
| signType: $(_SignType) | ||
| zipSources: false | ||
| feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json | ||
| ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we always use the dnceng feed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No idea.
|
@mmitche - fixed up |
|
At least in dnceng, this does not cause friction right now. Havne't tried devdiv yet. |
|
@mmitche - can you please approve? |
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/arcade/actions/runs/15742061669 |
|
@mmitche backporting to "release/9.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update microbuild to use PME service connection
Using index info to reconstruct a base tree...
A eng/common/core-templates/steps/install-microbuild.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): eng/common/core-templates/steps/install-microbuild.yml deleted in HEAD and modified in Update microbuild to use PME service connection. Version Update microbuild to use PME service connection of eng/common/core-templates/steps/install-microbuild.yml left in tree.
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 microbuild to use PME service connection
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
#15920) Co-authored-by: Juan Hoyos <[email protected]>
#15921) Co-authored-by: Juan Hoyos <[email protected]>
To double check: