Skip to content

Commit 2538b79

Browse files
authored
Update CI to test with GHC 9.12 (#1067)
1 parent 911b18e commit 2538b79

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 16 additions & 25 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.20241121
11+
# version: 0.19.20241219
1212
#
13-
# REGENDATA ("0.19.20241121",["github","--config=cabal.haskell-ci","--ghc-head","cabal.project"])
13+
# REGENDATA ("0.19.20241219",["github","--config=cabal.haskell-ci","--ghc-head","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.1
36+
compilerKind: ghc
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
3843
setup-method: ghcup
3944
allow-failure: false
40-
- compiler: ghc-9.8.2
45+
- compiler: ghc-9.8.4
4146
compilerKind: ghc
42-
compilerVersion: 9.8.2
47+
compilerVersion: 9.8.4
4348
setup-method: ghcup
4449
allow-failure: false
45-
- compiler: ghc-9.6.5
50+
- compiler: ghc-9.6.6
4651
compilerKind: ghc
47-
compilerVersion: 9.6.5
52+
compilerVersion: 9.6.6
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -98,10 +103,11 @@ jobs:
98103
mkdir -p "$HOME/.ghcup/bin"
99104
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
100105
chmod a+x "$HOME/.ghcup/bin/ghcup"
101-
- name: Install cabal-install
106+
- name: Install cabal-install (prerelease)
102107
run: |
103-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
104-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
109+
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
110+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
105111
- name: Install GHC (GHCup)
106112
if: matrix.setup-method == 'ghcup'
107113
run: |
@@ -116,21 +122,6 @@ jobs:
116122
HCKIND: ${{ matrix.compilerKind }}
117123
HCNAME: ${{ matrix.compiler }}
118124
HCVER: ${{ matrix.compilerVersion }}
119-
- name: Install GHC (GHCup prerelease)
120-
if: matrix.setup-method == 'ghcup-prerelease'
121-
run: |
122-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
123-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
124-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
125-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
126-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
127-
echo "HC=$HC" >> "$GITHUB_ENV"
128-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
129-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
130-
env:
131-
HCKIND: ${{ matrix.compilerKind }}
132-
HCNAME: ${{ matrix.compiler }}
133-
HCVER: ${{ matrix.compilerVersion }}
134125
- name: Set PATH and environment variables
135126
run: |
136127
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -141,7 +132,7 @@ jobs:
141132
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
142133
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
143134
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
144-
if [ $((HCNUMVER > 91001)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
135+
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
145136
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
146137
env:
147138
HCKIND: ${{ matrix.compilerKind }}

containers-tests/containers-tests.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extra-source-files:
2727

2828
tested-with:
2929
GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 ||
30-
==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1
30+
==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1
3131

3232
source-repository head
3333
type: git

containers/containers.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extra-source-files:
2828

2929
tested-with:
3030
GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 ||
31-
==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1
31+
==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1
3232

3333
source-repository head
3434
type: git

0 commit comments

Comments
 (0)