Skip to content

Commit 29713c5

Browse files
committed
Support GHC-9.12.2
1 parent 55f7cc5 commit 29713c5

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.2
36+
compilerKind: ghc
37+
compilerVersion: 9.12.2
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
@@ -81,12 +86,12 @@ jobs:
8186
- name: Install GHCup
8287
run: |
8388
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.50.0/x86_64-linux-ghcup-0.1.50.0 > "$HOME/.ghcup/bin/ghcup"
89+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
8590
chmod a+x "$HOME/.ghcup/bin/ghcup"
8691
- name: Install cabal-install
8792
run: |
88-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
89-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV"
93+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
94+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9095
- name: Install GHC (GHCup)
9196
if: matrix.setup-method == 'ghcup'
9297
run: |

cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ constraint-set servant-0.19
1717
constraints: servant ==0.19.*
1818

1919
constraint-set servant-0.20
20-
ghc: >= 8.10 && <9.12
20+
ghc: >= 8.10 && <9.14
2121
constraints: servant ==0.20.*

servant-swagger-ui-core/servant-swagger-ui-core.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ tested-with:
2727
|| ==9.6.7
2828
|| ==9.8.4
2929
|| ==9.10.1
30+
|| ==9.12.2
3031

3132
extra-source-files: Changelog.md
3233

@@ -38,7 +39,7 @@ library
3839
hs-source-dirs: src
3940
ghc-options: -Wall
4041
build-depends:
41-
base >=4.7 && <4.21
42+
base >=4.7 && <4.22
4243
, aeson >=0.8.0.2 && <2.3
4344
, blaze-markup >=0.7.0.2 && <0.9
4445
, bytestring >=0.10.4.0 && <0.13

servant-swagger-ui-example/servant-swagger-ui-example.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tested-with:
2222
|| ==9.6.7
2323
|| ==9.8.4
2424
|| ==9.10.1
25+
|| ==9.12.2
2526

2627
source-repository head
2728
type: git
@@ -32,7 +33,7 @@ executable servant-swagger-ui-example
3233
ghc-options: -threaded
3334
build-depends:
3435
aeson >=0.8.0.2 && <2.3
35-
, base >=4.7 && <4.21
36+
, base >=4.7 && <4.22
3637
, base-compat >=0.9.3 && <0.15
3738
, lens >=4.7.0.1 && <5.4
3839
, servant

servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ tested-with:
2626
|| ==9.6.7
2727
|| ==9.8.4
2828
|| ==9.10.1
29+
|| ==9.12.2
2930

3031
extra-source-files:
3132
jensoleg.index.html.tmpl
@@ -87,7 +88,7 @@ library
8788
ghc-options: -Wall
8889
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
8990
build-depends:
90-
base >=4.7 && <4.21
91+
base >=4.7 && <4.22
9192
, aeson >=0.8.0.2 && <2.3
9293
, bytestring >=0.10.4.0 && <0.13
9394
, file-embed-lzma >=0 && <0.2

servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ tested-with:
2626
|| ==9.6.7
2727
|| ==9.8.4
2828
|| ==9.10.1
29+
|| ==9.12.2
2930

3031
extra-source-files:
3132
redoc-dist-1.22.3/redoc.min.js
@@ -41,7 +42,7 @@ library
4142
ghc-options: -Wall
4243
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
4344
build-depends:
44-
base >=4.7 && <4.21
45+
base >=4.7 && <4.22
4546
, aeson >=0.8.0.2 && <2.3
4647
, bytestring >=0.10.4.0 && <0.13
4748
, file-embed-lzma >=0 && <0.2

servant-swagger-ui/servant-swagger-ui.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ tested-with:
2626
|| ==9.6.7
2727
|| ==9.8.4
2828
|| ==9.10.1
29+
|| ==9.12.2
2930

3031
extra-source-files:
3132
CHANGELOG.md
@@ -57,7 +58,7 @@ library
5758
ghc-options: -Wall
5859
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
5960
build-depends:
60-
base >=4.7 && <4.21
61+
base >=4.7 && <4.22
6162
, aeson >=0.8.0.2 && <2.3
6263
, bytestring >=0.10.4.0 && <0.13
6364
, file-embed-lzma >=0 && <0.2

0 commit comments

Comments
 (0)