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

Target GHC 9.2.2 #2787

Merged
merged 11 commits into from
Mar 21, 2022
Merged

Target GHC 9.2.2 #2787

merged 11 commits into from
Mar 21, 2022

Conversation

pepeiborra
Copy link
Collaborator

No description provided.

@July541
Copy link
Collaborator

July541 commented Mar 18, 2022

Development with 9.2.1 on M1 is entirely broken, it spent me a lot of time and finally found 9.2.2 is the solution.

@michaelpj
Copy link
Collaborator

Looks like we need to deal with digital-asset/ghc-lib#352

@July541
Copy link
Collaborator

July541 commented Mar 19, 2022

For reference, here script works for my M1 chip machine

>>> diff stack-9.2.1.yaml stack-9.2.2.yaml
2c2
< compiler: ghc-9.2.1
---
> compiler: ghc-9.2.2
49,50c49,50
< - ghc-lib-9.2.1.20220109
< - ghc-lib-parser-9.2.1.20220109
---
> - ghc-lib-9.2.2.20220307
> - ghc-lib-parser-9.2.2.20220307
92c92
< - ghc-boot-9.2.1
---
> # - ghc-boot-9.2.1

@pepeiborra pepeiborra marked this pull request as ready for review March 19, 2022 16:00
@michaelpj
Copy link
Collaborator

The branch protection rules need to be changed to require the 9.2.2 circleci job instead of the 9.2.1 one.

environment:
- STACK_FILE: "stack-9.2.1.yaml"
# https://github.com/digital-asset/ghc-lib/issues/352
- CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh, apparently I did notice, but this wasn't fixed. It appears to be broken to this day. @pepeiborra do you remember what you did here?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I've noticed this and #2936 is attempting to fix it up.

@wz1000 wz1000 enabled auto-merge (rebase) March 20, 2022 23:24
@wz1000 wz1000 disabled auto-merge March 21, 2022 09:40
@wz1000 wz1000 enabled auto-merge (rebase) March 21, 2022 09:40
auto-merge was automatically disabled March 21, 2022 12:22

Base branch was modified

@pepeiborra pepeiborra enabled auto-merge (squash) March 21, 2022 12:31
@pepeiborra pepeiborra merged commit a538641 into master Mar 21, 2022
July541 pushed a commit to July541/haskell-language-server that referenced this pull request Mar 30, 2022
* Target GHC 9.2.2

* fix with-compiler

* attempt to fix Mac build

* attempt to fix stack

* Apply @July541 suggestion

* add missing space

* fix yaml

* another yaml fix
@michaelpj
Copy link
Collaborator

Apparently this PR broke the caching workflow and nobody noticed :/

@July541
Copy link
Collaborator

July541 commented Jun 16, 2022

Caching works now :)

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.

None yet

4 participants