Bump public macos AzDO image to macos-15#4485
Conversation
This matches what the internal build uses and the macos-14 image will be discontinued later this year.
There was a problem hiding this comment.
Pull request overview
This PR updates the public macOS Azure DevOps image used in the VMR build pipeline to align with current internal usage and prepare for the deprecation of the macos-14 image.
Changes:
- Updated the
poolImage_Macvariable for public builds invmr-build.ymlfrommacos-14tomacos-15.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
/backport to release/10.0.1xx |
|
/backport to release/10.0.2xx |
|
/backport to release/10.0.3xx |
|
Started backporting to |
|
Started backporting to |
|
Started backporting to |
|
@akoeplinger backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Bump public macos AzDO image to macos-15
Using index info to reconstruct a base tree...
M eng/pipelines/templates/variables/vmr-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/templates/variables/vmr-build.yml
CONFLICT (content): Merge conflict in eng/pipelines/templates/variables/vmr-build.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 Bump public macos AzDO image to macos-15
Error: The process '/usr/bin/git' failed with exit code 128 |
|
@akoeplinger backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Bump public macos AzDO image to macos-15
Using index info to reconstruct a base tree...
M eng/pipelines/templates/variables/vmr-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/templates/variables/vmr-build.yml
CONFLICT (content): Merge conflict in eng/pipelines/templates/variables/vmr-build.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 Bump public macos AzDO image to macos-15
Error: The process '/usr/bin/git' failed with exit code 128 |
This matches what the internal build uses and the macos-14 image will be discontinued later this year.