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

Use --io-manager=native in lib-suite on Windows (backport #10114) #10344

Merged
merged 1 commit into from
Sep 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2024

Closes #9571


This is an automatic backport of pull request #10114 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Sep 13, 2024
Copy link
Contributor Author

mergify bot commented Sep 13, 2024

Cherry-pick of a562b57 has failed:

On branch mergify/bp/3.12/pr-10114
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit a562b57da.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cabal-testsuite/cabal-testsuite.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   validate.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Sep 14, 2024
@mergify mergify bot merged commit c0a5615 into 3.12 Sep 14, 2024
51 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10114 branch September 14, 2024 03:32
@geekosaur
Copy link
Collaborator

Uh. So if this was broken, how did it pass CI? (Every subsequent backport is failing on Windows with an -rtsopts error.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants