Move off preview onto regular Windows 11 client images#69871
Move off preview onto regular Windows 11 client images#69871MattGal merged 1 commit intodotnet:mainfrom
Conversation
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsClientPre is leaving as of 2022-06-16, move to newer non-preview Windows 11
|
|
@wfurt can you comment on whether I should merge here? the two failing linux legs are definitely unrelated but the Quic test is failing in the specific image I changed (https://helixre8s23ayyeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-69871-merge-767c9d837644425e9d/System.Net.Quic.Functional.Tests/1/console.c15b690d.log?helixlogtype=result ) |
|
that should be fine. The QUic failure is known and it should be resolved if you sync from main. |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/2476059672 |
|
@mangod9 backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Move off preview onto regular Windows 11 client images
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 Move off preview onto regular Windows 11 client images
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! |
|
@mangod9 just a simple grep is likely easier than the backport. |
ghost
locked as resolved and limited conversation to collaborators
4 participants
ClientPre is leaving as of 2022-06-16, move to newer non-preview Windows 11