Convert Tizen armel toolchain to dynamic lookup #15315
Merged
Conversation
This file contains hidden or 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
gbalykov
approved these changes
Dec 9, 2024
am11
changed the title
akoeplinger
approved these changes
Dec 9, 2024
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/arcade/actions/runs/12278693826 |
akoeplinger
changed the title
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/12379779136 |
|
@akoeplinger backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update armel toolchain version to 14.1.0
Applying: Convert to dynamic lookup
Using index info to reconstruct a base tree...
M eng/common/cross/toolchain.cmake
Falling back to patching base and 3-way merge...
Auto-merging eng/common/cross/toolchain.cmake
CONFLICT (content): Merge conflict in eng/common/cross/toolchain.cmake
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Convert to dynamic lookup
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
akoeplinger
pushed a commit
to akoeplinger/arcade
that referenced
this pull request
Dec 17, 2024
(cherry picked from commit 82a219d)
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.
Upstream of dotnet/runtime#110514.
cc @janvorli, @akoeplinger