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

Try each pkg-config query separatedly (backport #9134) #9550

Merged
merged 1 commit into from
Dec 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2023

This is an automatic backport of pull request #9134 done by Mergify.
Cherry-pick of 3afd3a3 has failed:

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

You are currently cherry-picking commit 3afd3a392.
  (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/pkgconfig-once

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

Cherry-pick of 9f15045 has failed:

On branch mergify/bp/3.10/pr-9134
Your branch is ahead of 'origin/3.10' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9f1504590.
  (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/pkgconfig-envvars

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/Simple/Program/Builtin.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.

The changes in PkgConfigDb.hs were already included with #9520. This PR should have been backported before that one, but in this situation, this is the remaining change from the backportee PR that is not yet backported.

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.

Got it. Let me set the label.

@Mikolaj Mikolaj added the merge me Tell Mergify Bot to merge label Dec 22, 2023
@mergify mergify bot merged commit d09cd57 into 3.10 Dec 22, 2023
41 checks passed
@mergify mergify bot deleted the mergify/bp/3.10/pr-9134 branch December 22, 2023 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants