-
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
[release/6.0][mono] Disable DoublinkList/dlstack tests #83268
[release/6.0][mono] Disable DoublinkList/dlstack tests #83268
Conversation
This test is disabled in main and this change makes its way back to 6.0 Fixes dotnet#83245
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
@lambdageek @vargaz are there more ignores I need to backport? |
@steveisok in case you plan to add more tests to ignore, please ping me when this is ready to merge so I hit the button. |
Will do. Given the results I think we may need to backport more. |
/backport to release/7.0 |
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/4389388904 |
Hmm... I'm curious to see if the bot will be smart enough to know what to backport from a 6.0 branch into a 7.0. Technically, it would be a forward-port. |
@lewing backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [mono] Disable DoublinkList/dlstack tests
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 [mono] Disable DoublinkList/dlstack tests
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/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
This test is disabled in main and this change makes its way back to 6.0
Fixes #83245