Skip to content

Commit

Permalink
Add 9.10 to CI, relax bounds (#574)
Browse files Browse the repository at this point in the history
* Add 9.10 to CI, relax bounds

* Some allow-newers

* Bump index-state

* Another

* More

* more

* More bounds relax

* more
  • Loading branch information
michaelpj authored May 16, 2024
1 parent 85a9565 commit c15fa82
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc-version: ['9.8', '9.6', '9.4', '9.2']
ghc-version: ['9.10', '9.8', '9.6', '9.4', '9.2']
# Unlikely that we'll succeed on windows and fail on macos,
# including it is just burning CI time. But windows could have
# path or IO issues, so worth including
Expand Down
22 changes: 18 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
index-state: 2024-04-30T00:00:00Z
index-state: 2024-05-16T14:00:00Z

packages:
./lsp
Expand All @@ -18,6 +18,20 @@ package lsp-types
-- has very many independent modules
ghc-options: -j4

-- We allow filepath-1.5, this lets us actually test it. There is no problem
-- on the lens side.
allow-newer: lens:filepath
if impl(ghc >= 9.9)
allow-newer:
aeson:containers,
aeson:template-haskell,
boring:base,
co-log-core:base,
entropy:base,
entropy:directory,
entropy:filepath,
entropy:process,
quickcheck-instances:base,
quickcheck-instances:containers,
semialign:base,
semialign:containers,
these:base,
uuid-types:template-haskell,
witherable:containers,
4 changes: 2 additions & 2 deletions lsp-test/lsp-test.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ library
, co-log-core ^>=0.3
, conduit ^>=1.3
, conduit-parse ^>=0.2
, containers ^>=0.6
, containers >=0.6 && < 0.8
, data-default ^>=0.7
, Diff >=0.4 && <0.6
, directory ^>=1.3
, exceptions ^>=0.10
, extra ^>=1.7
, filepath >=1.4 && < 1.6
, Glob >=0.9 && <0.11
, lens >=5.1 && <5.3
, lens >=5.1 && <5.4
, lens-aeson ^>=1.2
, lsp ^>=2.6
, lsp-types ^>=2.2
Expand Down
10 changes: 5 additions & 5 deletions lsp-types/lsp-types.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,23 @@ library
, aeson >=2 && <2.3
, base >=4.11 && <5
, binary ^>=0.8
, containers ^>=0.6
, containers >=0.6 && < 0.8
, data-default ^>=0.7
, deepseq >=1.4 && <1.6
, Diff >=0.4 && <0.6
, dlist ^>=1.0
, hashable ^>=1.4
, indexed-traversable ^>=0.1
, indexed-traversable-instances ^>=0.1
, lens >=5.1 && <5.3
, lens >=5.1 && <5.4
, mod ^>=0.2
, mtl >=2.2 && <2.4
, network-uri ^>=2.6
, prettyprinter ^>=1.7
, row-types ^>=1.0
, safe ^>=0.3
, some ^>=1.0
, template-haskell >=2.7 && <2.22
, template-haskell >=2.7 && <2.23
, text >=1 && <2.2

-- This version of filepath comes with GHC 9.6, so
Expand Down Expand Up @@ -583,8 +583,8 @@ library metamodel
, aeson >=2
, base >=4.11 && <5
, file-embed ^>=0.0.15
, lens >=5.1 && <5.3
, template-haskell >=2.7 && <2.22
, lens >=5.1 && <5.4
, template-haskell >=2.7 && <2.23
, text >=1 && <2.2

library lsp-types-quickcheck
Expand Down
4 changes: 2 additions & 2 deletions lsp/lsp.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ library
, base >=4.11 && <5
, bytestring >=0.10 && <0.13
, co-log-core ^>=0.3
, containers ^>=0.6
, containers >=0.6 && < 0.8
, data-default ^>=0.7
, directory ^>=1.3
, exceptions ^>=0.10
, extra ^>=1.7
, filepath >=1.4 && < 1.6
, hashable ^>=1.4
, lens >=5.1 && <5.3
, lens >=5.1 && <5.4
, lens-aeson ^>=1.2
, lsp-types ^>=2.2
, mtl >=2.2 && <2.4
Expand Down

0 comments on commit c15fa82

Please sign in to comment.