Skip to content

Generate Paths_ module with qualified Data.List.last import (backport #7650) #7656

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 1 commit into from
Sep 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 17, 2021

This is an automatic backport of pull request #7650 done by Mergify.


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.io/

@alexbiehl
Copy link
Member

This bot is pretty slick!

Mikolaj
Mikolaj previously approved these changes Sep 17, 2021
@Mikolaj Mikolaj self-requested a review September 17, 2021 07:58
@Mikolaj Mikolaj dismissed their stale review September 17, 2021 07:58

CI broke

@Mikolaj
Copy link
Member

Mikolaj commented Sep 17, 2021

I've dismissed my review, because something is wrong in CI and this needs a look.

@Mikolaj
Copy link
Member

Mikolaj commented Sep 17, 2021

The bootstrap CI failure is really misterious, because the changes between 3.6 and master for the related files seem completely irrelevant to it:

Run python3 bootstrap/bootstrap.py -w /opt/ghc/8.10.4/bin/ghc -d bootstrap/linux-8.10.4.json
Traceback (most recent call last):
  File "bootstrap/bootstrap.py", line 389, in <module>
    main()
  File "bootstrap/bootstrap.py", line 346, in main
    ghc = Compiler(args.with_compiler)
  File "bootstrap/bootstrap.py", line 74, in __init__
    raise TypeError(f'GHC {ghc_path} is not a file')
TypeError: GHC /opt/ghc/8.10.4/bin/ghc is not a file

So let me rerun the job instead of debugging further.

@Mikolaj
Copy link
Member

Mikolaj commented Sep 17, 2021

Got it! I've rerun the same "linux bootstrap" job for the PR being backported (https://github.com/haskell/cabal/runs/3633407832) and it failed the same on master. So GihHub Actions just switched off 8.10.4. I will try to bump the boostraps to 8.10.7 and see if it works then.

@jneira
Copy link
Member

jneira commented Sep 18, 2021

The bootstrap fix is merged with #7657 so rebasin
@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Sep 18, 2021

Command rebase: success

Branch has been successfully rebased

@jneira jneira force-pushed the mergify/bp/3.6/pr-7650 branch from 632ee05 to b278960 Compare September 18, 2021 13:20
Copy link
Member

@jneira jneira left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fix for this nasty bug

@jneira
Copy link
Member

jneira commented Sep 18, 2021

This is failing due to #7649 so any pr in 3.6 needs #7652 backported

https://github.com/haskell/cabal/runs/3640445372?check_suite_focus=true

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.

The CI failures are as expected at this stage of 3.6 CI fixing.

@Mikolaj Mikolaj merged commit 2f44d28 into 3.6 Sep 18, 2021
@mergify mergify bot deleted the mergify/bp/3.6/pr-7650 branch September 18, 2021 21:28
@Mikolaj
Copy link
Member

Mikolaj commented Sep 19, 2021

As soon as #7664 gets merged to 3.6 by mergifyIO, we can backport this again to 3.6 and it should merge correctly and pass CI fine this time. [Edit: error, wrong PR, #7652 is the one.]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants