Skip to content

Commit 4e53d16

Browse files
authored
CI: Run on GHC 9.8.4 (#127)
1 parent cb4d156 commit 4e53d16

File tree

7 files changed

+45
-30
lines changed

7 files changed

+45
-30
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 29 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.19.20240702
11+
# version: 0.19.20250115
1212
#
13-
# REGENDATA ("0.19.20240702",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20250115",["github","--config=cabal.haskell-ci","cabal.project"])
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.4
3636
compilerKind: ghc
37-
compilerVersion: 9.6.2
37+
compilerVersion: 9.8.4
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.4.5
40+
- compiler: ghc-9.6.6
4141
compilerKind: ghc
42-
compilerVersion: 9.4.5
42+
compilerVersion: 9.6.6
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.7
@@ -64,15 +69,29 @@ jobs:
6469
allow-failure: false
6570
fail-fast: false
6671
steps:
67-
- name: apt
72+
- name: apt-get install
6873
run: |
6974
apt-get update
7075
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
76+
- name: Install GHCup
77+
run: |
7178
mkdir -p "$HOME/.ghcup/bin"
72-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
79+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
7380
chmod a+x "$HOME/.ghcup/bin/ghcup"
74-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
81+
- name: Install cabal-install
82+
run: |
7583
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
84+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
85+
- name: Install GHC (GHCup)
86+
if: matrix.setup-method == 'ghcup'
87+
run: |
88+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
89+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
90+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
91+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
92+
echo "HC=$HC" >> "$GITHUB_ENV"
93+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
94+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
7695
env:
7796
HCKIND: ${{ matrix.compilerKind }}
7897
HCNAME: ${{ matrix.compiler }}
@@ -83,21 +102,12 @@ jobs:
83102
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
84103
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
85104
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
86-
HCDIR=/opt/$HCKIND/$HCVER
87-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
88-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
89-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
90-
echo "HC=$HC" >> "$GITHUB_ENV"
91-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
92-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
93-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
94105
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
95106
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
96107
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
97108
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
98109
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
99110
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
100-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
101111
env:
102112
HCKIND: ${{ matrix.compilerKind }}
103113
HCNAME: ${{ matrix.compiler }}
@@ -275,8 +285,8 @@ jobs:
275285
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' --dependencies-only -j2 all ; fi
276286
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
277287
- name: save cache
278-
uses: actions/cache/save@v4
279288
if: always()
289+
uses: actions/cache/save@v4
280290
with:
281291
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
282292
path: ~/.cabal/store

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.8
20+
ghc: >= 8.10 && <9.10
2121
constraints: servant ==0.20.*

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ tested-with:
2323
|| ==8.10.7
2424
|| ==9.0.2
2525
|| ==9.2.7
26-
|| ==9.4.5
27-
|| ==9.6.2
26+
|| ==9.4.8
27+
|| ==9.6.6
28+
|| ==9.8.4
2829

2930
extra-source-files: Changelog.md
3031

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ tested-with:
1818
|| ==8.10.7
1919
|| ==9.0.2
2020
|| ==9.2.7
21-
|| ==9.4.5
22-
|| ==9.6.2
21+
|| ==9.4.8
22+
|| ==9.6.6
23+
|| ==9.8.4
2324

2425
source-repository head
2526
type: git

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ tested-with:
2222
|| ==8.10.7
2323
|| ==9.0.2
2424
|| ==9.2.7
25-
|| ==9.4.5
26-
|| ==9.6.2
25+
|| ==9.4.8
26+
|| ==9.6.6
27+
|| ==9.8.4
2728

2829
extra-source-files:
2930
jensoleg.index.html.tmpl

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ tested-with:
2222
|| ==8.10.7
2323
|| ==9.0.2
2424
|| ==9.2.7
25-
|| ==9.4.5
26-
|| ==9.6.2
25+
|| ==9.4.8
26+
|| ==9.6.6
27+
|| ==9.8.4
2728

2829
extra-source-files:
2930
redoc-dist-1.22.3/redoc.min.js

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ tested-with:
2222
|| ==8.10.7
2323
|| ==9.0.2
2424
|| ==9.2.7
25-
|| ==9.4.5
26-
|| ==9.6.2
25+
|| ==9.4.8
26+
|| ==9.6.6
27+
|| ==9.8.4
2728

2829
extra-source-files:
2930
CHANGELOG.md

0 commit comments

Comments
 (0)