Skip to content

Revert workaround to filter JavaScriptFFI out on GHC versions where G… (backport #8979) #9029

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

Merged
merged 2 commits into from
Jun 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2023

This is an automatic backport of pull request #8979 done by Mergify.
Cherry-pick of 8c9a71e has failed:

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

You are currently cherry-picking commit 8c9a71e67.
  (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

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

#8979)

* Revert workaround to filter JavaScriptFFI out on GHC versions where GHC issue 11214 is fixed.

* Lint

* Lint

* Update version range to reflect the fix being included in GHC 9.8

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 8c9a71e)

# Conflicts:
#	Cabal/src/Distribution/Simple/GHC.hs
@Kleidukos Kleidukos added merge me Tell Mergify Bot to merge and removed conflicts labels Jun 17, 2023
mergify bot added a commit that referenced this pull request Jun 17, 2023
@mergify mergify bot merged commit b3a8632 into 3.10 Jun 17, 2023
@mergify mergify bot deleted the mergify/bp/3.10/pr-8979 branch June 17, 2023 18:33
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