Update timeout for sourcebuild #61436
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsReact to VM changes killing official builds.
|
safern
approved these changes
Nov 10, 2021
|
Fixes #61378 |
This was referenced Nov 29, 2021
|
/backport to release/6.0-maui |
|
Started backporting to release/6.0-maui: https://github.com/dotnet/runtime/actions/runs/1531584872 |
|
@directhex backporting to release/6.0-maui failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update timeout for sourcebuild
Using index info to reconstruct a base tree...
M eng/pipelines/runtime-official.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/runtime-official.yml
CONFLICT (content): Merge conflict in eng/pipelines/runtime-official.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 Update timeout for sourcebuild
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! |
directhex
pushed a commit
to directhex/runtime
that referenced
this pull request
Dec 2, 2021
(cherry picked from commit f9e0256)
safern
pushed a commit
that referenced
this pull request
Dec 2, 2021
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
React to VM changes killing official builds.