Arcade update + changes that should allow the "release/devXY.Z" branches #14168
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
…hes to use the "correct" pool providers when building
31 tasks
|
/backport to release/dev17.4 |
|
/backport to release/dev17.3 |
|
Started backporting to release/dev17.4: https://github.com/dotnet/fsharp/actions/runs/3320020354 |
|
Started backporting to release/dev17.3: https://github.com/dotnet/fsharp/actions/runs/3320021195 |
|
@MattGal do we need to backport it further to 17.2 and lower? |
|
@vzarytovskii backporting to release/dev17.4 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Arcade update + changes that should allow the "release/devXY.Z" branches to use the "correct" pool providers when building
Using index info to reconstruct a base tree...
M azure-pipelines.yml
M eng/Version.Details.xml
M eng/common/templates/job/source-build.yml
M eng/common/tools.sh
M global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
Auto-merging eng/common/tools.sh
Auto-merging eng/common/templates/job/source-build.yml
CONFLICT (content): Merge conflict in eng/common/templates/job/source-build.yml
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
Auto-merging azure-pipelines.yml
CONFLICT (content): Merge conflict in azure-pipelines.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 Arcade update + changes that should allow the "release/devXY.Z" branches to use the "correct" pool providers when building
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! |
|
@vzarytovskii backporting to release/dev17.3 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Arcade update + changes that should allow the "release/devXY.Z" branches to use the "correct" pool providers when building
Using index info to reconstruct a base tree...
M azure-pipelines.yml
M eng/Version.Details.xml
M eng/common/templates/job/source-build.yml
M eng/common/tools.sh
M global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
Auto-merging eng/common/tools.sh
Auto-merging eng/common/templates/job/source-build.yml
CONFLICT (content): Merge conflict in eng/common/templates/job/source-build.yml
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
Auto-merging azure-pipelines.yml
CONFLICT (content): Merge conflict in azure-pipelines.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 Arcade update + changes that should allow the "release/devXY.Z" branches to use the "correct" pool providers when building
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! |
|
Ok, it seems it's not as easy. |
T-Gro
approved these changes
Oct 27, 2022
vzarytovskii
approved these changes
Oct 27, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of dotnet/arcade#10578. This should be integrate-able to branches like release/dev17**.x** and cause it to pick the correct pool provider automatically.