Skip to content

Commit 95ba13d

Browse files
maksbotanmaksbotan
authored
Merge pull request #51 from biocad/maksbotan/ghc-9.8
Bump version for GHC 9.8
2 parents 757729a + d62495c commit 95ba13d

File tree

3 files changed

+37
-28
lines changed

3 files changed

+37
-28
lines changed

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

Lines changed: 26 additions & 19 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.16.6
11+
# version: 0.17.20231110
1212
#
13-
# REGENDATA ("0.16.6",["github","cabal.project","--config","cabal.haskell-ci"])
13+
# REGENDATA ("0.17.20231110",["github","cabal.project","--config","cabal.haskell-ci"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.6.2
35+
- compiler: ghc-9.8.1
3636
compilerKind: ghc
37-
compilerVersion: 9.6.2
37+
compilerVersion: 9.8.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.4.5
40+
- compiler: ghc-9.6.3
4141
compilerKind: ghc
42-
compilerVersion: 9.4.5
42+
compilerVersion: 9.6.3
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.4.8
46+
compilerKind: ghc
47+
compilerVersion: 9.4.8
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.2.8
@@ -75,18 +80,18 @@ jobs:
7580
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7681
if [ "${{ matrix.setup-method }}" = ghcup ]; then
7782
mkdir -p "$HOME/.ghcup/bin"
78-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$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"
7984
chmod a+x "$HOME/.ghcup/bin/ghcup"
8085
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
81-
"$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)
8287
else
8388
apt-add-repository -y 'ppa:hvr/ghc'
8489
apt-get update
8590
apt-get install -y "$HCNAME"
8691
mkdir -p "$HOME/.ghcup/bin"
87-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$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"
8893
chmod a+x "$HOME/.ghcup/bin/ghcup"
89-
"$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)
9095
fi
9196
env:
9297
HCKIND: ${{ matrix.compilerKind }}
@@ -100,17 +105,19 @@ jobs:
100105
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101106
HCDIR=/opt/$HCKIND/$HCVER
102107
if [ "${{ matrix.setup-method }}" = ghcup ]; then
103-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
108+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
109+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
110+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
104111
echo "HC=$HC" >> "$GITHUB_ENV"
105-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
106-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
107-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
112+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
113+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108115
else
109116
HC=$HCDIR/bin/$HCKIND
110117
echo "HC=$HC" >> "$GITHUB_ENV"
111118
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
112119
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
113-
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"
114121
fi
115122
116123
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -247,10 +254,10 @@ jobs:
247254
rm -f cabal.project.local
248255
- name: constraint set servant-0.20
249256
run: |
250-
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi
251-
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
252-
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
253-
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
257+
if [ $((HCNUMVER >= 81000 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi
258+
if [ $((HCNUMVER >= 81000 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
259+
if [ $((HCNUMVER >= 81000 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
260+
if [ $((HCNUMVER >= 81000 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
254261
- name: constraint set servant-0.19
255262
run: |
256263
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run ; fi

‎example/example.cabal‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ tested-with:
1919
|| ==8.10.7
2020
|| ==9.0.2
2121
|| ==9.2.8
22-
|| ==9.4.5
23-
|| ==9.6.2
22+
|| ==9.4.8
23+
|| ==9.6.3
24+
|| ==9.8.1
2425

2526
library
2627
ghc-options: -Wall
2728
hs-source-dirs: src/
2829
exposed-modules:
2930
Todo
30-
build-depends: base
31+
build-depends: base < 5
3132
, aeson
3233
, aeson-pretty
3334
, bytestring

‎servant-openapi3.cabal‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ tested-with:
3434
|| ==8.10.7
3535
|| ==9.0.2
3636
|| ==9.2.8
37-
|| ==9.4.5
38-
|| ==9.6.2
37+
|| ==9.4.8
38+
|| ==9.6.3
39+
|| ==9.8.1
3940

4041
extra-source-files:
4142
README.md
@@ -56,7 +57,7 @@ source-repository head
5657

5758
custom-setup
5859
setup-depends:
59-
base >=4.9 && <4.19,
60+
base >=4.9 && <4.20,
6061
Cabal >= 1.24 && < 4,
6162
cabal-doctest >=1.0.6 && <1.1
6263

@@ -78,9 +79,9 @@ library
7879
hs-source-dirs: src
7980
build-depends: aeson >=1.4.2.0 && <1.6 || >=2.0.1.0 && <2.3
8081
, aeson-pretty >=0.8.7 && <0.9
81-
, base >=4.9.1.0 && <4.19
82+
, base >=4.9.1.0 && <4.20
8283
, base-compat >=0.10.5 && <0.14
83-
, bytestring >=0.10.8.1 && <0.12
84+
, bytestring >=0.10.8.1 && <0.13
8485
, http-media >=0.7.1.3 && <0.9
8586
, insert-ordered-containers >=0.2.1.0 && <0.3
8687
, lens >=4.17 && <5.3
@@ -99,7 +100,7 @@ test-suite doctests
99100
build-depends:
100101
base,
101102
directory >= 1.0,
102-
doctest >= 0.11.1 && <0.22,
103+
doctest >= 0.11.1 && <0.23,
103104
servant,
104105
QuickCheck,
105106
filepath

0 commit comments

Comments
 (0)