Skip to content

Commit c15fa82

Browse files
authored
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
1 parent 85a9565 commit c15fa82

File tree

5 files changed

+28
-14
lines changed

5 files changed

+28
-14
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
ghc-version: ['9.8', '9.6', '9.4', '9.2']
17+
ghc-version: ['9.10', '9.8', '9.6', '9.4', '9.2']
1818
# Unlikely that we'll succeed on windows and fail on macos,
1919
# including it is just burning CI time. But windows could have
2020
# path or IO issues, so worth including

cabal.project

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
index-state: 2024-04-30T00:00:00Z
1+
index-state: 2024-05-16T14:00:00Z
22

33
packages:
44
./lsp
@@ -18,6 +18,20 @@ package lsp-types
1818
-- has very many independent modules
1919
ghc-options: -j4
2020

21-
-- We allow filepath-1.5, this lets us actually test it. There is no problem
22-
-- on the lens side.
23-
allow-newer: lens:filepath
21+
if impl(ghc >= 9.9)
22+
allow-newer:
23+
aeson:containers,
24+
aeson:template-haskell,
25+
boring:base,
26+
co-log-core:base,
27+
entropy:base,
28+
entropy:directory,
29+
entropy:filepath,
30+
entropy:process,
31+
quickcheck-instances:base,
32+
quickcheck-instances:containers,
33+
semialign:base,
34+
semialign:containers,
35+
these:base,
36+
uuid-types:template-haskell,
37+
witherable:containers,

lsp-test/lsp-test.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ library
5555
, co-log-core ^>=0.3
5656
, conduit ^>=1.3
5757
, conduit-parse ^>=0.2
58-
, containers ^>=0.6
58+
, containers >=0.6 && < 0.8
5959
, data-default ^>=0.7
6060
, Diff >=0.4 && <0.6
6161
, directory ^>=1.3
6262
, exceptions ^>=0.10
6363
, extra ^>=1.7
6464
, filepath >=1.4 && < 1.6
6565
, Glob >=0.9 && <0.11
66-
, lens >=5.1 && <5.3
66+
, lens >=5.1 && <5.4
6767
, lens-aeson ^>=1.2
6868
, lsp ^>=2.6
6969
, lsp-types ^>=2.2

lsp-types/lsp-types.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ library
6565
, aeson >=2 && <2.3
6666
, base >=4.11 && <5
6767
, binary ^>=0.8
68-
, containers ^>=0.6
68+
, containers >=0.6 && < 0.8
6969
, data-default ^>=0.7
7070
, deepseq >=1.4 && <1.6
7171
, Diff >=0.4 && <0.6
7272
, dlist ^>=1.0
7373
, hashable ^>=1.4
7474
, indexed-traversable ^>=0.1
7575
, indexed-traversable-instances ^>=0.1
76-
, lens >=5.1 && <5.3
76+
, lens >=5.1 && <5.4
7777
, mod ^>=0.2
7878
, mtl >=2.2 && <2.4
7979
, network-uri ^>=2.6
8080
, prettyprinter ^>=1.7
8181
, row-types ^>=1.0
8282
, safe ^>=0.3
8383
, some ^>=1.0
84-
, template-haskell >=2.7 && <2.22
84+
, template-haskell >=2.7 && <2.23
8585
, text >=1 && <2.2
8686

8787
-- This version of filepath comes with GHC 9.6, so
@@ -583,8 +583,8 @@ library metamodel
583583
, aeson >=2
584584
, base >=4.11 && <5
585585
, file-embed ^>=0.0.15
586-
, lens >=5.1 && <5.3
587-
, template-haskell >=2.7 && <2.22
586+
, lens >=5.1 && <5.4
587+
, template-haskell >=2.7 && <2.23
588588
, text >=1 && <2.2
589589

590590
library lsp-types-quickcheck

lsp/lsp.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ library
5959
, base >=4.11 && <5
6060
, bytestring >=0.10 && <0.13
6161
, co-log-core ^>=0.3
62-
, containers ^>=0.6
62+
, containers >=0.6 && < 0.8
6363
, data-default ^>=0.7
6464
, directory ^>=1.3
6565
, exceptions ^>=0.10
6666
, extra ^>=1.7
6767
, filepath >=1.4 && < 1.6
6868
, hashable ^>=1.4
69-
, lens >=5.1 && <5.3
69+
, lens >=5.1 && <5.4
7070
, lens-aeson ^>=1.2
7171
, lsp-types ^>=2.2
7272
, mtl >=2.2 && <2.4

0 commit comments

Comments
 (0)