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

Revert #3639 (Don't pass -package-db and -package flags to --abi-hash) (backport #9384) #9503

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 8, 2023

This is an automatic backport of pull request #9384 done by Mergify.
Cherry-pick of 01cfac0 has failed:

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

You are currently cherry-picking commit 01cfac0e6.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/Simple/GHC.hs
	both modified:   Cabal/src/Distribution/Simple/GHCJS.hs

no changes added to commit (use "git add" and/or "git commit -a")

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

@jasagredo
Copy link
Collaborator

@mergify refresh

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

refresh

✅ Pull request refreshed

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 now fixed

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.

It seems only formatting is changed compared to the original PR. Well done.

@jasagredo jasagredo added the merge me Tell Mergify Bot to merge label Dec 15, 2023
#9384)

* Revert #3639 (Don't pass -package-db and -package flags to --abi-hash)

With ghc>=9.6 `ghc --abi-hash` initialises the plugins so it will fail
if a cabal file specifies `ghc-options: -fplugin=Foo`.

Closes: #9375

* Also revert in GHC.hs

---------

Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 01cfac0)

# Conflicts:
#	Cabal/src/Distribution/Simple/GHC.hs
#	Cabal/src/Distribution/Simple/GHCJS.hs
@Mikolaj Mikolaj force-pushed the mergify/bp/3.10/pr-9384 branch from ae1a574 to 5f8cdfa Compare December 15, 2023 10:06
@mergify mergify bot merged commit 83ecb5c into 3.10 Dec 15, 2023
40 checks passed
@mergify mergify bot deleted the mergify/bp/3.10/pr-9384 branch December 15, 2023 12:06
@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
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.

3 participants