Skip to content

[tvOS] Bump to new OSX 13 AppleTV queue - #83272

Merged
steveisok merged 4 commits into
dotnet:mainfrom
steveisok:test-new-tvos-queue
Mar 21, 2023
Merged

[tvOS] Bump to new OSX 13 AppleTV queue#83272
steveisok merged 4 commits into
dotnet:mainfrom
steveisok:test-new-tvos-queue

Conversation

@steveisok

Copy link
Copy Markdown
Member

No description provided.

@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:steveisok
Assignees:-
Labels:

area-Infrastructure-libraries

Milestone:-

@steveisok

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-ioslike

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@steveisok

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-ioslike

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@steveisok

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-ioslike

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@steveisoksteveisok changed the title Test out new OSX 13 AppleTV queue[tvOS] Bump to new OSX 13 AppleTV queueMar 20, 2023
@steveisok
steveisok marked this pull request as ready for review March 20, 2023 20:39
@steveisok

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-ioslike

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@steveisok
steveisok requested a review from a teamMarch 20, 2023 20:40
@steveisok

Copy link
Copy Markdown
MemberAuthor

This change is going to need to be backported everywhere because the 10.15 and 11 queues are being consolidated into the 13 one.

@steveisok
steveisok merged commit 5896cbc into dotnet:mainMar 21, 2023
@steveisok

Copy link
Copy Markdown
MemberAuthor

/backport to release/8.0-preview3

@steveisok

Copy link
Copy Markdown
MemberAuthor

/backport to release/7.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0-preview3: https://github.com/dotnet/runtime/actions/runs/4480079151

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/4480081129

@github-actions

Copy link
Copy Markdown
Contributor

@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 128

Please backport manually!

@github-actions

Copy link
Copy Markdown
Contributor

@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.

@steveisok
steveisok deleted the test-new-tvos-queue branch March 21, 2023 14:21
@ghostghost locked as resolved and limited conversation to collaborators Apr 20, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@steveisok@directhex@akoeplinger@ViktorHofer