Repository navigation
[wasm] Re-enable skiasharp WBT tests - #109232
Merged
radekdoulik merged 9 commits intoNov 20, 2024
Merged
radekdoulik merged 9 commits into
radekdoulik merged 9 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
That would trigger build error, because we don't support that combination anymore
Put NativeFileReference files after the runtime libs. This server as a workaround of dotnet#109289
This was referenced Oct 30, 2024
This was referenced Nov 1, 2024
radekdoulik
force-pushed
the
pr-enable-skiasharp-tests-again
branch
from
adbf98f to
a7ab465
Compare
November 18, 2024 21:35
This was referenced Nov 19, 2024
Open
This reverts commit e320fd6.
This was referenced Nov 19, 2024
pavelsavara
approved these changes
Nov 19, 2024
Comment thread
src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs
akoeplinger
approved these changes
Nov 19, 2024
maraf
approved these changes
Nov 20, 2024
Copy link
Copy Markdown
Member
Author
|
/ba-g the failures are unrelated |
Sorry, something went wrong.
mikelle-rogers
pushed a commit
to mikelle-rogers/runtime
that referenced
this pull request
Dec 10, 2024
* [wasm] Re-enable skiasharp WBT tests * Disable Debug/AOT combination That would trigger build error, because we don't support that combination anymore * Change order of native libs Put NativeFileReference files after the runtime libs. This server as a workaround of dotnet#109289 * Update llvm, emsdk and icu deps * Revert "Change order of native libs" This reverts commit e320fd6.
Copy link
Copy Markdown
Member
Author
|
/backport to release/9.0-staging |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/12352375711 |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
@radekdoulik backporting to release/9.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: [wasm] Re-enable skiasharp WBT tests
Applying: Disable Debug/AOT combination
Applying: Change order of native libs
Applying: Update llvm, emsdk and icu deps
Using index info to reconstruct a base tree...
M eng/Version.Details.xml
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
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 0004 Update llvm, emsdk and icu deps
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Sorry, something went wrong.
radekdoulik
added a commit
to radekdoulik/runtime
that referenced
this pull request
Dec 16, 2024
* [wasm] Re-enable skiasharp WBT tests * Disable Debug/AOT combination That would trigger build error, because we don't support that combination anymore * Change order of native libs Put NativeFileReference files after the runtime libs. This server as a workaround of dotnet#109289 * Update llvm, emsdk and icu deps * Revert "Change order of native libs" This reverts commit e320fd6.
2 of 4 tasks
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Reviewers
Assignees
4 participants
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.
Resolves #103566
The included llvm bump (and emsdk, icu) fixes #109289 through dotnet/llvm-project#630