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

hie-compat: Add basic support for ghc 9.0.1 #1635

Merged
merged 5 commits into from
May 31, 2021
Merged

Conversation

anka-213
Copy link
Contributor

I made a three way merge between the original in GHC-8.10, GHC-9.0 and the custom version for GHC-8.10 from this package, in order to figure out what should be changed.

Perhaps we don't actually need the full fork of HieAst.hs for ghc-9.0, since the difference from the original is so small, so we could just reexport the original and replace mkHieFile with the custom version.

(Tiny step towards #297)

@jneira
Copy link
Member

jneira commented Mar 29, 2021

Many thanks for working on ghc-9.0.1 support 🙏

@anka-213
Copy link
Contributor Author

anka-213 commented May 2, 2021

All of these changes are in the new PR: #1649, so I'll just close this.

@anka-213 anka-213 closed this May 2, 2021
@anka-213 anka-213 reopened this May 29, 2021
@anka-213 anka-213 marked this pull request as ready for review May 29, 2021 08:44
@@ -0,0 +1,371 @@
{-
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does this need to be duplicated? I think it should be possible to just reexport GHC.Iface.Ext.Binary

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure. I just copied whatever was in the ghc-810 versions and updated it to the ghc-901 version.

@wz1000 wz1000 added the merge me Label to trigger pull request merge label May 30, 2021
@anka-213
Copy link
Contributor Author

Is there a reason why the circleci tests are not running? Is it waiting for something else first?

@Ailrun
Copy link
Member

Ailrun commented May 31, 2021

There's nothing on the queue (even this one), so it's an actual problem. I don't know whether it's a CircleCI bug or our setting's. One possible thing to try is add one commit (or rebase this PR) so that CI check is reactivated.

@jneira
Copy link
Member

jneira commented May 31, 2021

@Ailrun
Copy link
Member

Ailrun commented May 31, 2021

It looks like the linked CI run is for ead87d8 and the problematic one is for 47a7b44, so unfortunately I don't think rerun will help...

@jneira
Copy link
Member

jneira commented May 31, 2021

Mmm you are right, the merge was clean and maybe circleci has some trouble with that this time

@anka-213
Copy link
Contributor Author

anka-213 commented May 31, 2021

Is it possible to manually trigger circleci? Or should I rebase, so it can have a new chance to trigger?

@anka-213
Copy link
Contributor Author

I'll do that and then it should hopefully work as soon as someone re-approves the changes

@anka-213
Copy link
Contributor Author

anka-213 commented May 31, 2021

Maybe it didn't think it was worth re-running the CI because the merge only changed the README?

It seems to run the circleci again now.

@jneira
Copy link
Member

jneira commented May 31, 2021

Maybe it didn't think it was worth re-running the CI because the merge only changed the README?

It seems to run the circleci again now.

Unfortunately circleci dont support skip builds by file globs so not sure what happened (otoh checks would be not required in that case)
Afaik it does not support neither new manual builds chosing a commit of a branch out of the box. 😐

@mergify mergify bot merged commit 88548ac into haskell:master May 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge me Label to trigger pull request merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants