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

[release/6.0][mono] Disable DoublinkList/dlstack tests #83268

Merged
merged 2 commits into from
Mar 14, 2023

Conversation

steveisok
Copy link
Member

This test is disabled in main and this change makes its way back to 6.0

Fixes #83245

This test is disabled in main and this change makes its way back to 6.0

Fixes dotnet#83245
@dotnet-issue-labeler
Copy link

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.

@steveisok steveisok requested a review from BrzVlad March 10, 2023 17:09
@ghost ghost assigned steveisok Mar 10, 2023
@steveisok steveisok requested review from lambdageek and vargaz March 10, 2023 17:09
@steveisok
Copy link
Member Author

@lambdageek @vargaz are there more ignores I need to backport?

@carlossanlop
Copy link
Member

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

@steveisok
Copy link
Member Author

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

@lewing lewing changed the title [mono] Disable DoublinkList/dlstack tests [release/6.0][mono] Disable DoublinkList/dlstack tests Mar 10, 2023
@lewing
Copy link
Member

lewing commented Mar 10, 2023

/backport to release/7.0

@github-actions
Copy link
Contributor

Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/4389388904

@carlossanlop
Copy link
Member

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.

@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

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

@carlossanlop carlossanlop merged commit 1a1a8d3 into dotnet:release/6.0 Mar 14, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Apr 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants