Skip to content

Use helix platform variable aliases for macOS ARM64 and x64 queues #121373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agocke merged 25 commits into from
Nov 19, 2025
Merged

Use helix platform variable aliases for macOS ARM64 and x64 queues #121373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2ccb116
Initial plan
Copilot Nov 5, 2025
6ea1ef6
Use helix platform variable aliases for macOS ARM64 and x64 queues
Copilot Nov 5, 2025
65c5bd5
Import helix-platforms.yml in common variables for variable availability
Copilot Nov 5, 2025
363d319
Import helix-platforms.yml directly in helix-queues-setup files inste…
Copilot Nov 5, 2025
59982bd
Fix CI: Import helix-platforms.yml in xplat-setup.yml instead of heli…
Copilot Nov 5, 2025
217f94b
Remove duplicate helix-platforms.yml import from common/variables.yml
Copilot Nov 5, 2025
49d8d18
Move helix-platforms.yml import to helix-queues-setup files as variab…
Copilot Nov 5, 2025
d3e2d5c
Move variables to runtime pipeline
agocke Nov 6, 2025
8d6b31b
Move generic definitions to the bottom of the file
agocke Nov 6, 2025
688fc98
Use macro expansion
agocke Nov 6, 2025
2f9351c
Re-add variables import to libraries helix-platforms
agocke Nov 6, 2025
a6a5d3e
Typo
agocke Nov 6, 2025
b0c9ff0
Move back to global definition, but change use to runtime evaluation
agocke Nov 6, 2025
ebc5ee6
Re-add to runtime pipeline as global
agocke Nov 6, 2025
3a77451
Update macOS x64 to version 26 and use template substitution for vari…
Copilot Nov 6, 2025
f104a05
Use runtime expansion for helix variables and revert variables parame…
Copilot Nov 6, 2025
b8874e3
Update helix_macos_x64_latest_internal to OSX.26 for consistency
Copilot Nov 7, 2025
aaef983
Merge branch 'main' into copilot/update-helix-queue-names
agocke Nov 10, 2025
401b4c7
Merge branch 'main' into copilot/update-helix-queue-names
agocke Nov 12, 2025
51749e3
Merge branch 'main' into copilot/update-helix-queue-names
agocke Nov 13, 2025
c9c9f1c
Merge branch 'main' into copilot/update-helix-queue-names
agocke Nov 17, 2025
b4e9ac8
Update macOS x64 latest to OSX.15 (Sequoia 15)
Copilot Nov 17, 2025
e899216
Merge branch 'main' into copilot/update-helix-queue-names
agocke Nov 19, 2025
80ad629
Merge branch 'main' into copilot/update-helix-queue-names
agocke Nov 19, 2025
5855401
Temporarily skip MatchesCodesignOutput test due to macOS 26 behavior …
Copilot Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,17 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.isExtraPlatformsBuild, true)) }}:
- OSX.26.Arm64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
- OSX.13.Arm64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
# superpmi is not about testing platform differences, so go with highest capacity queue
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
- $(helix_macos_arm64)
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
- OSX.14.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.14.Arm64

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.13.Amd64.Open
- $(helix_macos_x64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.13.Amd64

Expand Down
Loading
Loading