Skip to content

Commit 9a922b6

Browse files
ysangkokysangkok
authored
Test/allow GHC 9.6, 9.8 (#72)
1 parent 987ffab commit 9a922b6

File tree

4 files changed

+43
-27
lines changed

4 files changed

+43
-27
lines changed

‎.github/workflows/haskell-ci.yml

+28-18
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.17.20230826
11+
# version: 0.17.20231203
1212
#
13-
# REGENDATA ("0.17.20230826",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
13+
# REGENDATA ("0.17.20231203",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,9 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.7
35+
- compiler: ghc-9.8.1
3636
compilerKind: ghc
37-
compilerVersion: 9.4.7
37+
compilerVersion: 9.8.1
38+
setup-method: ghcup
39+
allow-failure: true
40+
- compiler: ghc-9.6.3
41+
compilerKind: ghc
42+
compilerVersion: 9.6.3
43+
setup-method: ghcup
44+
allow-failure: true
45+
- compiler: ghc-9.4.8
46+
compilerKind: ghc
47+
compilerVersion: 9.4.8
3848
setup-method: ghcup
3949
allow-failure: true
4050
- compiler: ghc-9.2.8
@@ -70,18 +80,18 @@ jobs:
7080
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7181
if [ "${{ matrix.setup-method }}" = ghcup ]; then
7282
mkdir -p "$HOME/.ghcup/bin"
73-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
83+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
7484
chmod a+x "$HOME/.ghcup/bin/ghcup"
7585
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
76-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
86+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7787
else
7888
apt-add-repository -y 'ppa:hvr/ghc'
7989
apt-get update
8090
apt-get install -y "$HCNAME"
8191
mkdir -p "$HOME/.ghcup/bin"
82-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
92+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8393
chmod a+x "$HOME/.ghcup/bin/ghcup"
84-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
94+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8595
fi
8696
env:
8797
HCKIND: ${{ matrix.compilerKind }}
@@ -101,13 +111,13 @@ jobs:
101111
echo "HC=$HC" >> "$GITHUB_ENV"
102112
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
103113
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
104-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
105115
else
106116
HC=$HCDIR/bin/$HCKIND
107117
echo "HC=$HC" >> "$GITHUB_ENV"
108118
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
109119
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
110-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111121
fi
112122
113123
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -252,16 +262,16 @@ jobs:
252262
rm -f cabal.project.local
253263
- name: constraint set servant-0.20
254264
run: |
255-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run
256-
cabal-plan topo | sort
257-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all
258-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all
265+
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi
266+
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
267+
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
268+
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
259269
- name: constraint set servant-0.19
260270
run: |
261-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run
262-
cabal-plan topo | sort
263-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all
264-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
271+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run ; fi
272+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
273+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all ; fi
274+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all ; fi
265275
- name: constraint set servant-0.18
266276
run: |
267277
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all --dry-run ; fi

‎servant-multipart-api/servant-multipart-api.cabal

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ tested-with:
2121
|| ==8.10.7
2222
|| ==9.0.2
2323
|| ==9.2.8
24-
|| ==9.4.7
24+
|| ==9.4.8
25+
|| ==9.6.3
26+
|| ==9.8.1
2527

2628
library
2729
default-language: Haskell2010
@@ -31,8 +33,8 @@ library
3133
-- ghc boot libs
3234
build-depends:
3335
base >=4.9 && <5
34-
, bytestring >=0.10.8.1 && <0.12
35-
, text >=1.2.3.0 && <2.1
36+
, bytestring >=0.10.8.1 && <0.13
37+
, text >=1.2.3.0 && <2.2
3638
, transformers >=0.5.2.0 && <0.7
3739

3840
-- other dependencies

‎servant-multipart-client/servant-multipart-client.cabal

+5-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ tested-with:
2020
|| ==8.10.7
2121
|| ==9.0.2
2222
|| ==9.2.8
23-
|| ==9.4.7
23+
|| ==9.4.8
24+
|| ==9.6.3
25+
|| ==9.8.1
2426

2527
library
2628
default-language: Haskell2010
@@ -31,8 +33,8 @@ library
3133
build-depends:
3234
array >=0.5.1.1 && <0.6
3335
, base >=4.9 && <5
34-
, bytestring >=0.10.8.1 && <0.12
35-
, text >=1.2.3.0 && <2.1
36+
, bytestring >=0.10.8.1 && <0.13
37+
, text >=1.2.3.0 && <2.2
3638
, random >=0.1.1 && <1.3
3739

3840
-- other dependencies

‎servant-multipart/servant-multipart.cabal

+5-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ tested-with:
2020
|| ==8.10.7
2121
|| ==9.0.2
2222
|| ==9.2.8
23-
|| ==9.4.7
23+
|| ==9.4.8
24+
|| ==9.6.3
25+
|| ==9.8.1
2426

2527
library
2628
default-language: Haskell2010
@@ -30,9 +32,9 @@ library
3032
-- ghc boot libs
3133
build-depends:
3234
base >=4.9 && <5
33-
, bytestring >=0.10.8.1 && <0.12
35+
, bytestring >=0.10.8.1 && <0.13
3436
, directory >=1.3 && <1.4
35-
, text >=1.2.3.0 && <2.1
37+
, text >=1.2.3.0 && <2.2
3638

3739
-- other dependencies
3840
build-depends:

0 commit comments

Comments
 (0)