From c15fa8269d2e25bac7951547a0a31c0bb9a7f009 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Thu, 16 May 2024 16:55:53 +0100 Subject: [PATCH] Add 9.10 to CI, relax bounds (#574) * Add 9.10 to CI, relax bounds * Some allow-newers * Bump index-state * Another * More * more * More bounds relax * more --- .github/workflows/haskell.yml | 2 +- cabal.project | 22 ++++++++++++++++++---- lsp-test/lsp-test.cabal | 4 ++-- lsp-types/lsp-types.cabal | 10 +++++----- lsp/lsp.cabal | 4 ++-- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 4a7f9aab..780c695e 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -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 diff --git a/cabal.project b/cabal.project index 23b7f1e4..ec70c220 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ -index-state: 2024-04-30T00:00:00Z +index-state: 2024-05-16T14:00:00Z packages: ./lsp @@ -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, diff --git a/lsp-test/lsp-test.cabal b/lsp-test/lsp-test.cabal index 0d722499..948899f6 100644 --- a/lsp-test/lsp-test.cabal +++ b/lsp-test/lsp-test.cabal @@ -55,7 +55,7 @@ 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 @@ -63,7 +63,7 @@ library , 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 diff --git a/lsp-types/lsp-types.cabal b/lsp-types/lsp-types.cabal index deb85ab9..a96d5b65 100644 --- a/lsp-types/lsp-types.cabal +++ b/lsp-types/lsp-types.cabal @@ -65,7 +65,7 @@ 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 @@ -73,7 +73,7 @@ library , 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 @@ -81,7 +81,7 @@ library , 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 @@ -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 diff --git a/lsp/lsp.cabal b/lsp/lsp.cabal index efd59e74..1a87b2c7 100644 --- a/lsp/lsp.cabal +++ b/lsp/lsp.cabal @@ -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