Skip to content

Bump public macos AzDO image to macos-15#4485

Merged
akoeplinger merged 1 commit intomainfrom
akoeplinger-patch-3
Jan 28, 2026
Merged

Bump public macos AzDO image to macos-15#4485
akoeplinger merged 1 commit intomainfrom
akoeplinger-patch-3

Conversation

@akoeplinger
Copy link
Copy Markdown
Member

This matches what the internal build uses and the macos-14 image will be discontinued later this year.

This matches what the internal build uses and the macos-14 image will be discontinued later this year.
@akoeplinger akoeplinger requested review from a team as code owners January 28, 2026 13:39
Copilot AI review requested due to automatic review settings January 28, 2026 13:39
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

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_Mac variable for public builds in vmr-build.yml from macos-14 to macos-15.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@akoeplinger akoeplinger enabled auto-merge (squash) January 28, 2026 14:36
@akoeplinger akoeplinger merged commit c71a01c into main Jan 28, 2026
17 checks passed
@akoeplinger akoeplinger deleted the akoeplinger-patch-3 branch January 28, 2026 16:31
@akoeplinger
Copy link
Copy Markdown
Member Author

/backport to release/10.0.1xx

@akoeplinger
Copy link
Copy Markdown
Member Author

/backport to release/10.0.2xx

@akoeplinger
Copy link
Copy Markdown
Member Author

/backport to release/10.0.3xx

@github-actions
Copy link
Copy Markdown
Contributor

Started backporting to release/10.0.1xx (link to workflow run)

@github-actions
Copy link
Copy Markdown
Contributor

Started backporting to release/10.0.2xx (link to workflow run)

@github-actions
Copy link
Copy Markdown
Contributor

Started backporting to release/10.0.3xx (link to workflow run)

@github-actions
Copy link
Copy Markdown
Contributor

@akoeplinger backporting to release/10.0.2xx failed, the patch most likely resulted in conflicts. Please backport manually!

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

Link to workflow output

@github-actions
Copy link
Copy Markdown
Contributor

@akoeplinger backporting to release/10.0.3xx failed, the patch most likely resulted in conflicts. Please backport manually!

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

Link to workflow output

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