Skip to content

Bump stack configs + CI to 9.6.5 and 9.8.2 #4316

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 3 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ defaults: &defaults

version: 2
jobs:
stackage-lts21:
stackage-lts22:
docker:
- image: haskell:9.4.8-slim-buster
- image: haskell:9.6.5-slim-buster
environment:
- STACK_FILE: "stack-lts21.yaml"
- STACK_FILE: "stack-lts22.yaml"
<<: *defaults

stackage-nightly:
docker:
- image: haskell:9.6.4-slim-buster
- image: haskell:9.8.2-slim-buster
environment:
- STACK_FILE: "stack.yaml"
<<: *defaults
Expand All @@ -76,5 +76,5 @@ workflows:
version: 2
multiple-ghcs:
jobs:
- stackage-lts21
- stackage-lts22
- stackage-nightly
2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ library
, deepseq
, dependent-map
, dependent-sum
, Diff ^>=0.4.0
, Diff ^>=0.5
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Seems like this version has nice perf improvements: https://github.com/seereason/Diff/blob/master/CHANGELOG.md

Also needed to bump to avoid adding Diff-0.4 to extra deps because it's not in recent stack resolvers.

Copy link
Contributor

Choose a reason for hiding this comment

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

Small feedback: This change is making trouble in distributing.
There was as I see it no reason to raise the lower bound here. (Raising the upper bound is good.) Especially since Diff 0.4.0 is the current Diff version in stackage-lts this lower bound bump seems a bit hasty.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sorry for that. I didn't think about it too deeply. Do you want me to try to widen the range again?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure. Would probably be a good idea, but I have a workaround downstream so I don’t care too much.

, directory
, dlist
, enummapset
Expand Down
7 changes: 1 addition & 6 deletions haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ library hls-cabal-plugin
, lsp-types ^>=2.3
, regex-tdfa ^>=1.3.1
, text
, text-rope
, transformers
, unordered-containers >=0.2.10.0
, containers
Expand Down Expand Up @@ -455,7 +454,7 @@ library hls-eval-plugin
, bytestring
, containers
, deepseq
, Diff ^>=0.4.0
, Diff ^>=0.5
, dlist
, extra
, filepath
Expand Down Expand Up @@ -584,7 +583,6 @@ library hls-rename-plugin
, hls-plugin-api == 2.8.0.0
, haskell-language-server:hls-refactor-plugin
, lens
, lsp
, lsp-types
, mtl
, mod
Expand Down Expand Up @@ -638,7 +636,6 @@ library hls-retrie-plugin
, base >=4.12 && <5
, bytestring
, containers
, directory
, extra
, ghc
, ghcide == 2.8.0.0
Expand All @@ -655,7 +652,6 @@ library hls-retrie-plugin
, text
, transformers
, unordered-containers
, filepath

default-extensions:
DataKinds
Expand Down Expand Up @@ -845,7 +841,6 @@ library hls-module-name-plugin
, aeson
, base >=4.12 && <5
, containers
, directory
, filepath
, ghcide == 2.8.0.0
, hls-plugin-api == 2.8.0.0
Expand Down
2 changes: 1 addition & 1 deletion hls-plugin-api/hls-plugin-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ library
, data-default
, dependent-map
, dependent-sum >=0.7
, Diff ^>=0.4.0
, Diff ^>=0.5
, dlist
, extra
, filepath
Expand Down
58 changes: 0 additions & 58 deletions stack-lts21.yaml

This file was deleted.

58 changes: 58 additions & 0 deletions stack-lts22.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
resolver: lts-22.25 # ghc-9.6.5

packages:
- .
- ./hie-compat
- ./hls-graph
- ./ghcide/
- ./hls-plugin-api
- ./hls-test-utils
# - ./shake-bench

ghc-options:
"$everything": -haddock

allow-newer: true
allow-newer-deps:
- extensions

extra-deps:
- Diff-0.5
- floskell-0.11.1
- hiedb-0.6.0.1
- hie-bios-0.14.0
- implicit-hie-0.1.4.0
- lsp-2.7.0.0
- lsp-test-0.17.1.0
- lsp-types-2.3.0.0
- monad-dijkstra-0.1.1.4 # 5
- retrie-1.2.3

# stan and friends
- stan-0.1.3.0
- dir-traverse-0.2.3.0
- extensions-0.1.0.1
- tomland-1.3.3.2
- trial-0.0.0.0
- trial-optparse-applicative-0.0.0.0
- trial-tomland-0.0.0.0
- validation-selective-0.2.0.0

configure-options:
ghcide:
- --disable-library-for-ghci
haskell-language-server:
- --disable-library-for-ghci

flags:
haskell-language-server:
pedantic: true
stylish-haskell:
ghc-lib: true
retrie:
BuildExecutable: false

nix:
packages: [icu libcxx zlib]

concurrent-tests: false
52 changes: 29 additions & 23 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-22.9 # ghc-9.6.4
resolver: nightly-2024-06-12 # ghc-9.8.2

packages:
- .
Expand All @@ -13,41 +13,47 @@ ghc-options:
"$everything": -haddock

allow-newer: true
allow-newer-deps:
- extensions
- hw-fingertree
- retrie

extra-deps:
- floskell-0.11.1
- retrie-1.2.2
- hiedb-0.6.0.0
- hie-bios-0.14.0
- implicit-hie-0.1.4.0
- lsp-2.7.0.0
- lsp-test-0.17.1.0
- lsp-types-2.3.0.0
- monad-dijkstra-0.1.1.4

# stan and friends
- stan-0.1.2.0
- dir-traverse-0.2.3.0
- extensions-0.1.0.1
- tomland-1.3.3.2
- trial-0.0.0.0
- trial-optparse-applicative-0.0.0.0
- trial-tomland-0.0.0.0
- validation-selective-0.2.0.0
- floskell-0.11.1
- hiedb-0.6.0.1
- hie-bios-0.14.0
- implicit-hie-0.1.4.0
- hw-fingertree-0.1.2.1
- lsp-2.7.0.0
- lsp-test-0.17.1.0
- lsp-types-2.3.0.0
- monad-dijkstra-0.1.1.5
- stylish-haskell-0.14.6.0
- retrie-1.2.3

# stan dependencies not found in the stackage snapshot
- stan-0.1.3.0
- dir-traverse-0.2.3.0
- extensions-0.1.0.1
- trial-0.0.0.0
- trial-optparse-applicative-0.0.0.0
- trial-tomland-0.0.0.0

configure-options:
ghcide:
- --disable-library-for-ghci
- --disable-library-for-ghci
haskell-language-server:
- --disable-library-for-ghci
- --disable-library-for-ghci

flags:
haskell-language-server:
pedantic: true
stylish-haskell:
ghc-lib: true
retrie:
BuildExecutable: false

nix:
packages: [ icu libcxx zlib ]
packages: [icu libcxx zlib]

concurrent-tests: false
Loading