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

Don't add extra-prog-path to ~/.config/cabal/config (#8951) (backport #8952) #9050

Merged
merged 1 commit into from
Jul 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 20, 2023

This is an automatic backport of pull request #8952 done by Mergify.
Cherry-pick of ea55955 has failed:

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

You are currently cherry-picking commit ea55955ed.
  (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/tests/IntegrationTests2.hs
	modified:   cabal-install/tests/IntegrationTests2/config/default-config
	new file:   changelog.d/issue-8951

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install/src/Distribution/Client/Config.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

@Kleidukos Kleidukos added the squash+merge me Tell Mergify Bot to squash-merge label Jul 12, 2023
@Kleidukos Kleidukos removed the squash+merge me Tell Mergify Bot to squash-merge label Jul 12, 2023
@Kleidukos
Copy link
Member

@Mergifyio squash

…port #8952) (#9050)

Don't add `extra-prog-path` to `~/.config/cabal/config` (#8951)

(when initially creating it)

(cherry picked from commit ea55955)

# Conflicts:
#	cabal-install/src/Distribution/Client/Config.hs

* fix conflict

* Merge branch '3.10' into mergify/bp/3.10/pr-8952
@mergify
Copy link
Contributor Author

mergify bot commented Jul 12, 2023

squash

✅ Pull request squashed successfully

@Kleidukos Kleidukos force-pushed the mergify/bp/3.10/pr-8952 branch from 8077fc3 to f247c0b Compare July 12, 2023 22:00
mergify bot added a commit that referenced this pull request Jul 13, 2023
@mergify mergify bot merged commit 5d86771 into 3.10 Jul 13, 2023
@mergify mergify bot deleted the mergify/bp/3.10/pr-8952 branch July 13, 2023 02:07
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jul 15, 2023
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