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

cabal-install-solver: fix pkgconf 1.9 --modversion regression (backport #9391) #9520

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #9391 done by Mergify.
Cherry-pick of 3832bea has failed:

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

You are currently cherry-picking commit 3832beaf5.
  (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:
	new file:   changelog.d/pr-9391

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install-solver/src/Distribution/Solver/Types/PkgConfigDb.hs

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Copy link
Collaborator

@jasagredo jasagredo left a comment

Choose a reason for hiding this comment

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

Rebase conflicts are resolved now

@jasagredo
Copy link
Collaborator

@mergify refresh

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

refresh

✅ Pull request refreshed

Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

I compared with the original PR and they are quire different as chunks of text, but fortunately mostly in that a comment from another PR was pulled in the backport, which is probably for the best. Please feel free to set a merge label.

@jasagredo jasagredo added the merge me Tell Mergify Bot to merge label Dec 15, 2023
Check that the numbers of *versions* output is equal to the number of pkgconf's

fixes #8923

The pkgconf behavior was reverted upstream in 2.0

(this should cover the case too of checking that equal pkgList lines are output also)

(cherry picked from commit 3832bea)

# Conflicts:
#	cabal-install-solver/src/Distribution/Solver/Types/PkgConfigDb.hs
@mergify mergify bot merged commit 204948f into 3.10 Dec 15, 2023
41 checks passed
@mergify mergify bot deleted the mergify/bp/3.10/pr-9391 branch December 15, 2023 14:02
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Dec 17, 2023
@grayjay
Copy link
Collaborator

grayjay commented Dec 21, 2023

It looks like this PR contains part of the logic of #9134. Was #9134 intended to be backported, too? It introduced the bug that was fixed by #9391, so if #9134 doesn't need to be backported, then #9391 shouldn't need to be backported either.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants