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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use hackage version of czipwith #2346

Merged
merged 13 commits into from Nov 17, 2021
Merged

Conversation

jneira
Copy link
Member

@jneira jneira commented Nov 11, 2021

  • One less to finish 馃槄
  • I updated the living stack.yaml's and cabal-ghc912.project. cabal finds a plan with it but dont know if it compiles

@jneira jneira requested a review from fendor November 11, 2021 21:01
Comment on lines -82 to -90
constraints:
Agda ==2.6.1.3,
Diff ==0.4.0,
EdisonAPI ==1.3.1,
EdisonCore ==1.3.2.1,
FPretty ==1.1,
HTTP ==4000.3.16,
HUnit ==1.6.2.0,
QuickCheck ==2.14.2,
Copy link
Collaborator

Choose a reason for hiding this comment

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

did you intend to delete all the constraints?

Copy link
Member Author

@jneira jneira Nov 11, 2021

Choose a reason for hiding this comment

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

Yep, afaiu we usually dont need them having pinned the hackage index. They usually live in a cabal.project.freeze and no in the main one,. But maybe @fendor could expand the rationale behind

Copy link
Collaborator

@fendor fendor Nov 12, 2021

Choose a reason for hiding this comment

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

IIRC, these are constraints from head.hackage to make sure the patched versions of packages are used. I think removal of them is fine, assuming all of our dependencies now really work with GHC 9.2.

Copy link
Member Author

@jneira jneira Nov 12, 2021

Choose a reason for hiding this comment

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

Oh, i see, maybe it would be nice to add another cabal-9.2.1.project.local with all the info needed to use head.hackage: the head.hackage repository info itself (it is advised in the head.hackage repo to set it per project/cabal.project.local) + constraints if needed
So any developer could use such cabal-9.2.1.project.local out of the box

Copy link
Collaborator

Choose a reason for hiding this comment

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

If you prefer an additional file containing it, fine by me. BTW, these constraints might be outdated, unsure how to best proceed with updating these.

Copy link
Member Author

@jneira jneira Nov 12, 2021

Choose a reason for hiding this comment

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

cabal freeze having head.hackage as a overlay repo could help? maybe we could add the head.hackage repo in cabal-921.project if it is needed to make it work for sure (and remove it when patches are upstreamed)

And use directly the constraints it offer: https://ghc.gitlab.haskell.org/head.hackage/cabal.constraints
Or use directly head.hackage.sh init-local

We also could check if index-state affects head.hackage so it could help to avoid the need of constraints

Copy link
Collaborator

@fendor fendor left a comment

Choose a reason for hiding this comment

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

LGTM!

@jneira jneira added the merge me Label to trigger pull request merge label Nov 12, 2021
@jneira
Copy link
Member Author

jneira commented Nov 17, 2021

As for November 16, circleci has set a timeout of 1 hour for jobs in free plans
Trying to increase resources to make the build faster as suggested by its support center

@jneira
Copy link
Member Author

jneira commented Nov 17, 2021

As for November 16, circleci has set a timeout of 1 hour for jobs in free plans Trying to increase resources to make the build faster as suggested by its support center

Thanks to using the large docker machine and being able to set 4 threads for build times are significantly better: 30 m without cache and 12 with it 馃帀

@jneira jneira mentioned this pull request Nov 17, 2021
@mergify mergify bot merged commit 07042d4 into haskell:master Nov 17, 2021
jneira added a commit to jneira/haskell-language-server that referenced this pull request Nov 17, 2021
jneira added a commit that referenced this pull request Nov 18, 2021
* Use hackage version of czipwith

* Update stack.yaml's

* Remove source czipwith

* Update index and clean cabal-ghc921.project

* extra-1.7.9 has a breaking change so no way

* Increase resources for circleci

As for November 16, circleci has set a timeout of 1 hour for jobs in free plans
Trying to increase resources to make the build faster as suggested by its support center

* Use more threads reduce build times

* Correct runs-on field

* Update stack.yaml's

* Dont fail fast if we are checking

* Use ref_name to check it is a check

* Bump patch version of brittany plugin

* Allow newer base/th for czipwith

* Add enough allow-newers to allow build the project

Having all subpackages included in the `packages` field

* Correct allow-newer's

* Add missing cd's

* Bump up ghcide to 1.5.0

* Exclude pkgs not buildable with 9.0.1

* Bum up plugins with changes versions

* Bum up subpackages with changes versions

* Bum up hls version to 1.5.0

* Bump up haddock plugin version

* Allow ghcide 1.5

* Use ghcide 1.5.0 in the rest of plugins

* Use ghcide 1.5.0 for pragmas

* Allow tactics 1.5.0 for hls

* Remove czipwith in hackage ci script

* Disable 9.0.1 for hackage ci

* Use bounds operator consistently

* Build formatters with newer ghc-lib-parser

* Only stylish-haskell needs newer ghc-lib

* Avoid ghc-9.0.1 in other way

* Script needs a min time version

* First draft of 1.5.0 changelog

* Comment out hackage for 9.0.1

* allow newer ghc-lib-parser

* Remove redundant entry

* Correct condition

* Cancel previous hackage jobs

* Add link to pepe's talk slides

* Use th-extras master

* Use th-extras master and uncomment packages

* add extra-1.7.9

* Add required extra-deps

* Comment unbuildable packages again

* Add ignore-plugins-ghc-bounds

* Add #2354

* Complete ghc deprecation notice

* Add extra-1.7.9

* Add #2346 to Changelog
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.

None yet

3 participants