Skip to content

PXC-5355 [9.7] Revert "Disable Azure Pipelines macOS legs" - #2401

Closed
jaideepkarande wants to merge 1 commit into
percona:9.7from
jaideepkarande:PXC-5355-9.7-revert-macos-for-release-9.7.2
Closed

jaideepkarande wants to merge 1 commit into
percona:9.7from
jaideepkarande:PXC-5355-9.7-revert-macos-for-release-9.7.2

Conversation

@jaideepkarande

Copy link
Copy Markdown
Contributor

PXC-5355 [9.7] Revert "Disable Azure Pipelines macOS legs"

https://perconadev.atlassian.net/browse/PXC-5355

This reverts commit 725ef8e (PR #2383).

PXC-5355's change to azure-pipelines.yml conflicts with the PS-11473 matrix restructure on release-9.7.2-2, which blocks the PXC 9.7.2 release branch from merging into 9.7. Reverting it temporarily lets the release merge cleanly, without pulling 9.7-only fixes into the release branch.

The macOS 14 legs will be disabled again, on top of the new matrix layout, in a follow-up PR once the release branch is merged into 9.7. Until then, PR runs on 9.7 include the macOS 14 RelWithDebInfo leg, which is expected to fail because the macOS-14 image has been removed.

Test plan

  • Revert applies cleanly on 9.7 (60bef3add54); only azure-pipelines.yml changes
  • With this revert, merging release-9.7.2-2 (e648f70198d) into 9.7 has no conflicts (checked locally)
  • Follow-up PR re-disabling the macOS legs after the release merge

🤖 Generated with Claude Code

https://perconadev.atlassian.net/browse/PXC-5355

This reverts commit 725ef8e.

The PXC-5355 change to azure-pipelines.yml conflicts with the
PS-11473 matrix restructure on release-9.7.2-2, which blocks the
release PR percona#2398 from merging into 9.7. Revert it temporarily so the
release merges cleanly; the macOS legs will be disabled again on top
of the new matrix layout in a follow-up PR once percona#2398 is merged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

@inikep inikep left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is not how it should be done.
Just ask AI to solve a conflict in #2398
It will add an additional commit that solves the conflict on top of commits.

@jaideepkarande

Copy link
Copy Markdown
Contributor Author

Superseded by #2404: instead of reverting PXC-5355, 9.7 takes the release branch's azure-pipelines.yml so the release merges cleanly.

@jaideepkarande
jaideepkarande deleted the PXC-5355-9.7-revert-macos-for-release-9.7.2 branch November 12, 2026 10:57
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.

3 participants