Conversation
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries |
|
note that release/6.0 has one more usage in the file so that needs to be removed too while backporting |
|
/backport to release/8.0-staging |
|
/backport to release/7.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/8666367290 |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/8666368321 |
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/8666369668 |
|
@jkoritzinsky backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Remove Win7 Helix queues
Using index info to reconstruct a base tree...
M eng/pipelines/libraries/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
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
Patch failed at 0001 Remove Win7 Helix queues
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@jkoritzinsky an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Backport of #100981 to release/6.0-staging ## Customer Impact - [ ] Customer reported - [X] Found internally Due to changing internal requirements, Helix is decomissioning the Win7 queues. As a result, we need to stop sending work to them before they are turned off (as any build that uses them after that point will fail. ## Regression - [ ] Yes - [X] No ## Testing Infrastructure-only removal of a queue, no testing necessary. ## Risk Low: Simple removal of a Helix queue. We do lose some test coverage, but we can't keep the queue around. **IMPORTANT**: If this backport is for a servicing release, please verify that: - The PR target branch is `release/X.0-staging`, not `release/X.0`. - If the change touches code that ships in a NuGet package, you have added the necessary [package authoring](https://github.com/dotnet/runtime/blob/main/docs/project/library-servicing.md) and gotten it explicitly reviewed.
|
/ba-g Slow mac issue |
3 participants
Due to changing internal requirements, Helix is decomissioning the Win7 queues.
As a result, we need to stop sending work to them before they are turned off (as any build that uses them after that point will fail.
This will need to be backported.