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

update base bounds for desupported ghc 8.2 (backport #9964) #9980

Merged
merged 1 commit into from
May 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 6, 2024

Per #9952 (comment).

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 #9964 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label May 6, 2024
Copy link
Contributor Author

mergify bot commented May 6, 2024

Cherry-pick of c2c914a has failed:

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

You are currently cherry-picking commit c2c914a10.
  (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-syntax/Cabal-syntax.cabal
	modified:   Cabal/Cabal.cabal
	modified:   cabal-dev-scripts/cabal-dev-scripts.cabal
	modified:   cabal-install/cabal-install.cabal

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   Cabal-hooks/Cabal-hooks.cabal
	both modified:   Cabal-tests/Cabal-tests.cabal
	both modified:   cabal-install-solver/cabal-install-solver.cabal
	both modified:   cabal-testsuite/cabal-testsuite.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

@ulysses4ever
Copy link
Collaborator

I pushed an update to resolve conflicts here.

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

@ulysses4ever ulysses4ever added the merge me Tell Mergify Bot to merge label May 10, 2024
(cherry picked from commit c2c914a)

# Conflicts:
#	Cabal-hooks/Cabal-hooks.cabal
#	Cabal-tests/Cabal-tests.cabal
#	cabal-install-solver/cabal-install-solver.cabal
#	cabal-testsuite/cabal-testsuite.cabal
@mergify mergify bot merged commit 4193f06 into 3.12 May 10, 2024
49 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9964 branch May 10, 2024 19:35
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