-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Fix failures in internal validation pipeline #123452
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.
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This pull request fixes failures in the internal validation pipeline by adjusting Helix queue configurations for different platforms and adding support for private NuGet feed authentication in cross-platform jobs.
Changes:
- Modified Android queue selection logic to use Ubuntu-based queues for internal builds when Windows-based queues are unavailable
- Added public/internal queue differentiation for iOS, tvOS, Android, and Browser WASM platforms in CoreCLR template
- Added private NuGet feed credential setup for non-public builds in xplat-job template
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| eng/pipelines/libraries/helix-queues-setup.yml | Modified Android queue selection to always use Ubuntu.2204 queue for internal builds and specific Android platforms, with a comment explaining the workaround |
| eng/pipelines/coreclr/templates/helix-queues-setup.yml | Added conditional logic to select different Helix queues (with/without ".Open" suffix) based on whether the build is public or internal for multiple platforms |
| eng/pipelines/common/templates/runtimes/xplat-job.yml | Added steps to restore internal tools and configure private NuGet feed credentials for non-public builds, with platform-specific handling |
|
/ba-g known scaleset failure |
|
/backport to release/10.0 |
|
Started backporting to |
|
@jkoritzinsky backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Set up feed credentials for internal validation PR pipeline
Applying: Fix the open/internal split for runtime helix queues
Using index info to reconstruct a base tree...
M eng/pipelines/coreclr/templates/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/coreclr/templates/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/coreclr/templates/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 0002 Fix the open/internal split for runtime helix queues
Error: The process '/usr/bin/git' failed with exit code 128 |
Fixes #123444 main PR #123452 # Description Fix internal validation pipeline so we can validate backflow from the VMR for internal/release/10.x. # Customer Impact None, infra only change # Regression None, infra only change # Testing <!-- What kind of testing has been done with the fix. --> # Risk <!-- Please assess the risk of taking this fix. Provide details backing up your assessment. --> # Package authoring no longer needed in .NET 9 IMPORTANT: Starting with .NET 9, you no longer need to edit a NuGet package's csproj to enable building and bump the version. Keep in mind that we still need package authoring in .NET 8 and older versions.
Fixes #123444