Skip to content
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

Conversation

elinor-fung
Copy link
Member

Fixes #84724

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Apr 12, 2023
@ghost ghost assigned elinor-fung Apr 12, 2023
@lewing
Copy link
Member

lewing commented Apr 12, 2023

dotnet/aspnetcore#47652 it looks like this code gets hit in real life too

@elinor-fung elinor-fung changed the base branch from release/7.0 to release/7.0-staging April 12, 2023 22:47
Copy link
Member

@carlossanlop carlossanlop left a 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.

@carlossanlop carlossanlop added area-Interop-mono and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Apr 14, 2023
@lewing
Copy link
Member

lewing commented Apr 17, 2023

/backport to release/6.0

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/4726085124

@github-actions
Copy link
Contributor

@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!

@github-actions
Copy link
Contributor

@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.

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Apr 24, 2023
@carlossanlop carlossanlop merged commit 91c7793 into dotnet:release/7.0-staging Apr 24, 2023
@elinor-fung elinor-fung deleted the skipDllImportSearchPathsTest branch May 1, 2023 13:12
@ghost ghost locked as resolved and limited conversation to collaborators May 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Interop-mono Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants