Commit e40a978
authored
Move macOS PR helix queues to 26 for arm64 and 15 for amd64 (#121373)
Replace hardcoded macOS queue names with centralized variable aliases
from `eng/pipelines/helix-platforms.yml`, enabling automatic version
updates across PR and CI definitions.
This PR updates the default queues for libraries and coreclr PRs to use
the latest macOS versions.
## Changes Made
**Pipeline Configuration Files:**
- Added helix-platforms.yml import to runtime.yml, coreclr/ci.yml, and
libraries/variables.yml at the pipeline level to avoid Azure Pipelines
size limits
**Helix Platform Definitions (helix-platforms.yml):**
- Updated `helix_macos_x64_latest` from OSX.13.Amd64.Open to
OSX.15.Amd64.Open (Sequoia 15)
- Updated `helix_macos_x64_latest_internal` from OSX.13.Amd64 to
OSX.15.Amd64 (Sequoia 15)
- ARM64 uses OSX.26.Arm64.Open (Sequoia 15 with macOS 26.x kernel)
- x64 uses OSX.15.Amd64.Open (Sequoia 15)
- Changed common aliases to use template substitution `${{ variables.*
}}` for variable definitions
**Queue Setup Files:**
- installer/helix-queues-setup.yml: Replaced hardcoded OSX queue names
with runtime expansion `$(helix_macos_arm64)` and `$(helix_macos_x64)`
- libraries/helix-queues-setup.yml: Replaced hardcoded OSX queue names
with runtime expansion `$(helix_macos_arm64)` and `$(helix_macos_x64)`
- coreclr/templates/helix-queues-setup.yml: Replaced public branch
hardcoded queue names with runtime expansion `$(helix_macos_arm64)` and
`$(helix_macos_x64)` while preserving superpmi-diffs exception
(OSX.14.Arm64.Open) and internal queues
**Test Changes:**
- Temporarily skipped `MatchesCodesignOutput` test due to macOS 26
codesign behavior change (only hashing __TEXT segment instead of entire
file). This test will need to be updated in a follow-up to accommodate
the new codesign behavior.
## Variable Expansion Strategy
- **Variable definitions** in helix-platforms.yml use template
substitution `${{ variables.* }}` for compile-time evaluation
- **Variable references** in helix-queues-setup.yml files use runtime
expansion `$(...)` for runtime evaluation
## Out of Scope
- iOS/tvOS simulator/device queues (unchanged)
- Python scripts (e.g., superpmi_collect_setup.py)
- Older versions remain at their respective macOS versions
## Current Variable Resolutions
- `helix_macos_arm64` → OSX.26.Arm64.Open (Sequoia 15)
- `helix_macos_x64` → OSX.15.Amd64.Open (Sequoia 15)
- `helix_macos_arm64_latest_internal` → OSX.26.Arm64 (Sequoia 15)
- `helix_macos_x64_latest_internal` → OSX.15.Amd64 (Sequoia 15)1 parent 1395bb6 commit e40a978
File tree
6 files changed
+98
-103
lines changed- eng/pipelines
- coreclr/templates
- installer
- libraries
- src/installer/tests/Microsoft.NET.HostModel.Tests/MachObjectSigning
6 files changed
+98
-103
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
113 | 110 | | |
114 | 111 | | |
115 | 112 | | |
116 | 113 | | |
117 | 114 | | |
118 | 115 | | |
119 | 116 | | |
120 | | - | |
| 117 | + | |
121 | 118 | | |
122 | 119 | | |
123 | 120 | | |
| |||
0 commit comments