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

Bump dependencies and cabal-version (backport #10082) #10094

Merged
merged 3 commits into from
Jun 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 9, 2024

base and QuickCheck + cabal-version since 2.2 seems to have been released around December 2017.


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). no

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

Copy link
Contributor Author

mergify bot commented Jun 9, 2024

Cherry-pick of 5226cd8 has failed:

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

You are currently cherry-picking commit 5226cd8c9.
  (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-install/cabal-install.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install-solver/cabal-install-solver.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 9, 2024
@mergify mergify bot mentioned this pull request Jun 9, 2024
2 tasks
@mergify mergify bot added the backport label Jun 9, 2024
@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-10082 branch from c821b12 to 9b046b6 Compare June 9, 2024 21:08
@ulysses4ever ulysses4ever added squash+merge me Tell Mergify Bot to squash-merge and removed conflicts labels Jun 10, 2024
ffaf1 and others added 3 commits June 11, 2024 09:16
base and QuickCheck.

(cherry picked from commit 5226cd8)

# Conflicts:
#	cabal-install-solver/cabal-install-solver.cabal
For `Cabal` and `cabal-install`.

(cherry picked from commit bb24ef5)
@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.12/pr-10082 branch from 9b046b6 to 1b171b9 Compare June 11, 2024 13:16
@mergify mergify bot merged commit d873282 into 3.12 Jun 11, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10082 branch June 11, 2024 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants