-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Skip DllImportSearchPathsTest on wasm #84735
Skip DllImportSearchPathsTest on wasm #84735
Conversation
dotnet/aspnetcore#47652 it looks like this code gets hit in real life too |
c0e7458
to
c07a4ff
Compare
c07a4ff
to
b006eff
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @elinor-fung!
FYI, PR submitters of tell-mode changes (test-only, infra-only) can get their PR automatically unblocked for merging* by adding the Servicing-approved
label themselves. This allows the required check-service-label
CI action to pass.
*Assuming it's been signed-off and the CI failures are investigated as unrelated, of course.
/backport to release/6.0 |
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/4726085124 |
@lewing backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Skip DllImportSearchPathsTest on wasm
Using index info to reconstruct a base tree...
M src/tests/issues.targets
Falling back to patching base and 3-way merge...
Auto-merging src/tests/issues.targets
CONFLICT (content): Merge conflict in src/tests/issues.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Skip DllImportSearchPathsTest on wasm
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! |
@lewing an error occurred while backporting to release/6.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Fixes #84724