Skip to content

Conversation

@hoyosjs
Copy link
Member

@hoyosjs hoyosjs commented Apr 29, 2025

To double check:

@dougbu
Copy link
Contributor

dougbu commented Apr 30, 2025

why is this a draft @hoyosjs

@hoyosjs
Copy link
Member Author

hoyosjs commented Apr 30, 2025

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.

@dougbu
Copy link
Contributor

dougbu commented Apr 30, 2025

@mmitche ^^

@mmitche
Copy link
Member

mmitche commented Jun 12, 2025

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')) }}:
Copy link
Member Author

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?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea.

@hoyosjs
Copy link
Member Author

hoyosjs commented Jun 12, 2025

@mmitche - fixed up

@mmitche
Copy link
Member

mmitche commented Jun 12, 2025

At least in dnceng, this does not cause friction right now. Havne't tried devdiv yet.

@hoyosjs hoyosjs marked this pull request as ready for review June 12, 2025 23:59
@hoyosjs hoyosjs enabled auto-merge (squash) June 12, 2025 23:59
@hoyosjs
Copy link
Member Author

hoyosjs commented Jun 18, 2025

@mmitche - can you please approve?

@hoyosjs hoyosjs merged commit 09b8f81 into main Jun 18, 2025
11 checks passed
@hoyosjs hoyosjs deleted the hoyosjs-patch-1 branch June 18, 2025 19:39
@mmitche
Copy link
Member

mmitche commented Jun 18, 2025

/backport to release/9.0

@github-actions
Copy link
Contributor

Started backporting to release/9.0: https://github.com/dotnet/arcade/actions/runs/15742061669

@github-actions
Copy link
Contributor

@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 128

Please backport manually!

mmitche pushed a commit to mmitche/arcade that referenced this pull request Jun 20, 2025
mmitche pushed a commit to mmitche/arcade that referenced this pull request Jun 20, 2025
mmitche added a commit that referenced this pull request Jun 20, 2025
hoyosjs added a commit that referenced this pull request Jun 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants