Skip to content

Bump remaining macOS Helix queues to current versions#129240

Open
akoeplinger wants to merge 2 commits into
dotnet:mainfrom
akoeplinger:bump-osx-queues-main
Open

Bump remaining macOS Helix queues to current versions#129240
akoeplinger wants to merge 2 commits into
dotnet:mainfrom
akoeplinger:bump-osx-queues-main

Conversation

@akoeplinger

@akoeplinger akoeplinger commented Jun 10, 2026

Copy link
Copy Markdown
Member

Note

This PR description was drafted with assistance from GitHub Copilot.

A few hardcoded macOS Helix queue references in main were missed during the centralization of queue names into eng/pipelines/helix-platforms.yml. This PR migrates them to the shared $(helix_macos_*) variables, which also bumps them to the current "latest" macOS versions.

Changes

  • eng/pipelines/coreclr/templates/helix-queues-setup.yml:
    • Internal osx_arm64: OSX.14.Arm64$(helix_macos_arm64_latest_internal) (OSX.26)
    • Internal osx_x64: OSX.13.Amd64$(helix_macos_x64_latest_internal) (OSX.15)
    • superpmi-diffs public queue: OSX.15.Arm64.Open$(helix_macos_arm64) (OSX.26). Since this now matches the regular public osx_arm64 queue, the conditional split was consolidated.
  • src/coreclr/scripts/superpmi_collect_setup.py: arm64 SPMI collection queues bumped from OSX.15 to OSX.26 (public and internal), matching arm64 latest.

A similar cleanup was done on release/10.0 in #122990.

akoeplinger and others added 2 commits June 10, 2026 16:13
- coreclr internal osx_arm64: OSX.14.Arm64 → $(helix_macos_arm64_latest_internal) (OSX.26)
- coreclr internal osx_x64: OSX.13.Amd64 → $(helix_macos_x64_latest_internal) (OSX.15)
- superpmi collect arm64 (public/internal): OSX.15 → OSX.26

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Both public branches now resolve to the same queue, so consolidate.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@akoeplinger

Copy link
Copy Markdown
Member Author

/cc @steveisok

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

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 finishes migrating remaining hardcoded macOS Helix queue names to the shared helix_macos_* variables (defined in eng/pipelines/helix-platforms.yml), and bumps the affected macOS ARM64 queues to the current “latest” version.

Changes:

  • Update CoreCLR Helix queue selection to use $(helix_macos_*_latest_internal) variables for internal macOS queues, and simplify the public osx_arm64 selection by removing the superpmi-diffs special-case split.
  • Bump SuperPMI collection macOS ARM64 queues in superpmi_collect_setup.py from OSX.15 to OSX.26 (public + internal).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
src/coreclr/scripts/superpmi_collect_setup.py Updates the macOS ARM64 Helix queue strings used for SuperPMI collection jobs to OSX.26 (public/internal).
eng/pipelines/coreclr/templates/helix-queues-setup.yml Replaces remaining hardcoded internal macOS queues with shared helix_macos_*_latest_internal variables and removes the public superpmi-diffs queue split for osx_arm64.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Todo

Development

Successfully merging this pull request may close these issues.

2 participants