Fix internal Helix queue alias expansion - #133704
Merged
akoeplinger merged 2 commits intoSep 11, 2026
Merged
Conversation
Resolve library and installer queue aliases at template expansion time so internal submissions can strip .Open before runtime macro expansion. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 6ecee3ed-4a6f-4c01-bf01-118338ab3dcc
|
Azure Pipelines: Successfully started running 4 pipeline(s). 12 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure |
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No unresolved blocking issues were identified.
Pull request overview
Fixes internal Helix queue alias expansion by resolving aliases during template expansion, enabling .Open normalization.
Changes:
- Replaced runtime queue macros with compile-time variable references.
- Updated library and installer queue selectors.
File summaries
| File | Description |
|---|---|
eng/pipelines/libraries/helix-queues-setup.yml |
Resolves library queue aliases before normalization. |
eng/pipelines/installer/helix-queues-setup.yml |
Resolves installer macOS queue aliases at template time. |
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 0
- Review effort level: Lite
Keep runtime alias expansion and select internal aliases before submission, matching the CoreCLR queue setup. Compile-time alias references were empty in the expanded pipeline. Document the selection requirement in all three queue templates. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 6ecee3ed-4a6f-4c01-bf01-118338ab3dcc
lewing
approved these changes
Sep 11, 2026
This was referenced Sep 11, 2026
Member
Author
|
/ba-g unrelated test failures |
Member
Author
|
/backport to release/11.0 |
Contributor
|
Started backporting to |
Contributor
|
@akoeplinger backporting to git am output$ git cherry-pick bd6d336bfd95a333e8b3f22f26259bbb659974cf
Auto-merging eng/pipelines/coreclr/templates/helix-queues-setup.yml
Auto-merging eng/pipelines/installer/helix-queues-setup.yml
Auto-merging eng/pipelines/libraries/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/helix-queues-setup.yml
error: could not apply bd6d336bfd9... Fix internal Helix queue alias expansion (#133704)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix internal Helix queue alias expansion
Using index info to reconstruct a base tree...
M eng/pipelines/installer/helix-queues-setup.yml
M eng/pipelines/libraries/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/installer/helix-queues-setup.yml
Auto-merging eng/pipelines/libraries/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/helix-queues-setup.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 Fix internal Helix queue alias expansion
Error: The process '/usr/bin/git' failed with exit code 128 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix internal Helix submissions using public
.Openqueues, including the macOS Mono MiniJIT libraries and iOS/MacCatalyst smoke jobs.The libraries and installer submission templates strip
.openwith a compile-time${{ replace(...) }}expression. Queue aliases passed as$(helix_...)do not expand until runtime, so the replacement sees only the macro name and leaves the eventual public queue unchanged. Helix then rejects the submission:Explicitly select public or
_internalqueue aliases based onSystem.TeamProject, matching the existing CoreCLR queue-selector pattern. Keep runtime macro expansion so the aliases remain available through the nested pipeline templates, without relying on compile-time.openremoval for alias values. This also covers the Windows x64 libraries alias and macOS-hosted browser tests. Public queue selection remains unchanged.Note
This PR description was generated with GitHub Copilot.