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 tasty-quickcheck 0.11 (backport #10136) #10137

Merged
merged 1 commit into from
Jun 23, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2024

tasty-quickcheck 0.11, which was just released, is API incompatible with earlier versions. Exclude it from build plans. (Why were we using it without an upper bound?)

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

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

Copy link
Contributor Author

mergify bot commented Jun 23, 2024

Cherry-pick of 3964da3 has failed:

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

You are currently cherry-picking commit 3964da345.
  (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-tests/Cabal-tests.cabal
	modified:   cabal-install-solver/cabal-install-solver.cabal
	modified:   cabal-install/cabal-install.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal-described/Cabal-described.cabal

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

@mergify mergify bot added the conflicts label Jun 23, 2024
@mergify mergify bot mentioned this pull request Jun 23, 2024
2 tasks
@mergify mergify bot added the backport label Jun 23, 2024
API incompatible with our test suites

(cherry picked from commit 3964da3)
@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed conflicts labels Jun 23, 2024
@mergify mergify bot merged commit dfdc8f8 into 3.12 Jun 23, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10136 branch June 23, 2024 20:10
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.

1 participant