Skip to content

Commit d4533c5

Browse files
maksbotanmaksbotan
authored
Merge pull request haskell-servant#100 from haskell-servant/maksbotan/ghc-9.2
Allow 9.2, add 9.2 CI
2 parents ce291ba + 85999a1 commit d4533c5

File tree

7 files changed

+25
-13
lines changed

7 files changed

+25
-13
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.14
11+
# version: 0.14.3
1212
#
13-
# REGENDATA ("0.14",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.14.3",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.2.2
36+
compilerKind: ghc
37+
compilerVersion: 9.2.2
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.0.2
3641
compilerKind: ghc
3742
compilerVersion: 9.0.2
@@ -60,7 +65,7 @@ jobs:
6065
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
6166
if [ "${{ matrix.setup-method }}" = ghcup ]; then
6267
mkdir -p "$HOME/.ghcup/bin"
63-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
68+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
6469
chmod a+x "$HOME/.ghcup/bin/ghcup"
6570
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
6671
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
@@ -69,7 +74,7 @@ jobs:
6974
apt-get update
7075
apt-get install -y "$HCNAME"
7176
mkdir -p "$HOME/.ghcup/bin"
72-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
77+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
7378
chmod a+x "$HOME/.ghcup/bin/ghcup"
7479
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
7580
fi
@@ -204,6 +209,8 @@ jobs:
204209
echo " ghc-options: -Werror=missing-methods" >> cabal.project
205210
echo "package servant-swagger-ui-redoc" >> cabal.project
206211
echo " ghc-options: -Werror=missing-methods" >> cabal.project
212+
cat >> cabal.project <<EOF
213+
EOF
207214
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$/; }' >> cabal.project.local
208215
cat cabal.project
209216
cat cabal.project.local
@@ -255,8 +262,8 @@ jobs:
255262
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
256263
- name: constraint set servant-0.18
257264
run: |
258-
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
259-
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
265+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
266+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
260267
- name: constraint set servant-0.17
261268
run: |
262269
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi

‎cabal.haskell-ci‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ constraint-set servant-0.17
99
constraints: servant ==0.17.*
1010

1111
constraint-set servant-0.18
12-
ghc: >= 8.6 && <9.4
12+
ghc: >= 8.6 && <9.2
1313
constraints: servant ==0.18.*
1414

1515
constraint-set servant-0.19

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ tested-with:
2323
|| ==8.8.4
2424
|| ==8.10.7
2525
|| ==9.0.2
26+
|| ==9.2.2
2627

2728
extra-source-files: Changelog.md
2829

@@ -34,7 +35,7 @@ library
3435
hs-source-dirs: src
3536
ghc-options: -Wall
3637
build-depends:
37-
base >=4.7 && <4.16
38+
base >=4.7 && <4.17
3839
, aeson >=0.8.0.2 && <2.1.0
3940
, blaze-markup >=0.7.0.2 && <0.9
4041
, bytestring >=0.10.4.0 && <0.12
@@ -44,7 +45,7 @@ library
4445
, servant-server >=0.14 && <0.20
4546
, text >=1.2.3.0 && <2.1
4647
, transformers >=0.3 && <0.6
47-
, transformers-compat >=0.3 && <0.7
48+
, transformers-compat >=0.3 && <0.8
4849
, wai-app-static >=3.0.1.1 && <3.2
4950

5051
exposed-modules: Servant.Swagger.UI.Core

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ tested-with:
1818
|| ==8.8.4
1919
|| ==8.10.7
2020
|| ==9.0.2
21+
|| ==9.2.2
2122

2223
source-repository head
2324
type: git
@@ -28,7 +29,7 @@ executable servant-swagger-ui-example
2829
ghc-options: -threaded
2930
build-depends:
3031
aeson >=0.8.0.2 && <2.1.0
31-
, base >=4.7 && <4.16
32+
, base >=4.7 && <4.17
3233
, base-compat >=0.9.3 && <0.13
3334
, lens >=4.7.0.1 && <5.2
3435
, servant

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tested-with:
2222
|| ==8.8.4
2323
|| ==8.10.7
2424
|| ==9.0.2
25+
|| ==9.2.2
2526

2627
extra-source-files:
2728
jensoleg.index.html.tmpl
@@ -83,7 +84,7 @@ library
8384
ghc-options: -Wall
8485
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
8586
build-depends:
86-
base >=4.7 && <4.16
87+
base >=4.7 && <4.17
8788
, aeson >=0.8.0.2 && <2.1.0
8889
, bytestring >=0.10.4.0 && <0.12
8990
, file-embed-lzma >=0 && <0.1

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tested-with:
2222
|| ==8.8.4
2323
|| ==8.10.7
2424
|| ==9.0.2
25+
|| ==9.2.2
2526

2627
extra-source-files:
2728
redoc-dist-1.22.3/redoc.min.js
@@ -37,7 +38,7 @@ library
3738
ghc-options: -Wall
3839
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
3940
build-depends:
40-
base >=4.7 && <4.16
41+
base >=4.7 && <4.17
4142
, aeson >=0.8.0.2 && <2.1.0
4243
, bytestring >=0.10.4.0 && <0.12
4344
, file-embed-lzma >=0 && <0.1

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tested-with:
2222
|| ==8.8.4
2323
|| ==8.10.7
2424
|| ==9.0.2
25+
|| ==9.2.2
2526

2627
extra-source-files:
2728
CHANGELOG.md
@@ -47,7 +48,7 @@ library
4748
ghc-options: -Wall
4849
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
4950
build-depends:
50-
base >=4.7 && <4.16
51+
base >=4.7 && <4.17
5152
, aeson >=0.8.0.2 && <2.1.0
5253
, bytestring >=0.10.4.0 && <0.12
5354
, file-embed-lzma >=0 && <0.1

0 commit comments

Comments
 (0)