[tvOS] Bump to new OSX 13 AppleTV queue #83272
Conversation
|
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue Detailsnull
|
|
/azp run runtime-ioslike |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run runtime-ioslike |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run runtime-ioslike |
|
Azure Pipelines successfully started running 1 pipeline(s). |
steveisok
changed the title
|
/azp run runtime-ioslike |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This change is going to need to be backported everywhere because the 10.15 and 11 queues are being consolidated into the 13 one. |
|
/backport to release/8.0-preview3 |
|
/backport to release/7.0 |
|
Started backporting to release/8.0-preview3: https://github.com/dotnet/runtime/actions/runs/4480079151 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/4480081129 |
|
@steveisok backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Test new AppleTV queue
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
Applying: Test extra platforms
Applying: Update comment
error: sha1 information is lacking or useless (eng/pipelines/libraries/helix-queues-setup.yml).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Update comment
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! |
|
@steveisok an error occurred while backporting to release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
ghost
locked as resolved and limited conversation to collaborators
3 participants
No description provided.