Skip to content

Commit 8602cb6

Browse files
committed
Bump CI to GHC 9.12.0
1 parent 415e474 commit 8602cb6

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.19.20240703
11+
# version: 0.19.20241111
1212
#
13-
# REGENDATA ("0.19.20240703",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.19.20241111",["--config=cabal.haskell-ci","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.0.20241031
36+
compilerKind: ghc
37+
compilerVersion: 9.12.0.20241031
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
@@ -94,8 +99,9 @@ jobs:
9499
apt-get update
95100
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
96101
mkdir -p "$HOME/.ghcup/bin"
97-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
98103
chmod a+x "$HOME/.ghcup/bin/ghcup"
104+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://github.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
99105
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
100106
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101107
env:
@@ -120,7 +126,7 @@ jobs:
120126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
121127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
122128
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
123-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
129+
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
124130
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
125131
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
126132
env:
@@ -149,6 +155,18 @@ jobs:
149155
repository hackage.haskell.org
150156
url: http://hackage.haskell.org/
151157
EOF
158+
if $HEADHACKAGE; then
159+
cat >> $CABAL_CONFIG <<EOF
160+
repository head.hackage.ghc.haskell.org
161+
url: https://ghc.gitlab.haskell.org/head.hackage/
162+
secure: True
163+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
164+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
165+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
166+
key-threshold: 3
167+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
168+
EOF
169+
fi
152170
cat >> $CABAL_CONFIG <<EOF
153171
program-default-options
154172
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -209,8 +227,10 @@ jobs:
209227
constraints: github-samples +openssl
210228
constraints: operational -buildExamples
211229
optimization: False
212-
allow-newer: containers
213230
EOF
231+
if $HEADHACKAGE; then
232+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
233+
fi
214234
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(github|github-samples)$/; }' >> cabal.project.local
215235
cat cabal.project
216236
cat cabal.project.local
@@ -250,16 +270,6 @@ jobs:
250270
run: |
251271
rm -f cabal.project.local
252272
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
253-
- name: prepare for constraint sets
254-
run: |
255-
rm -f cabal.project.local
256-
- name: constraint set containers-0.7
257-
run: |
258-
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all --dry-run ; fi
259-
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
260-
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' --dependencies-only -j2 all ; fi
261-
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
262-
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
263273
- name: save cache
264274
uses: actions/cache/save@v4
265275
if: always()

cabal.haskell-ci

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs-selection: any
1212
-- constraints: text >= 2.0
1313
-- allow-newer: *:text -- allow-newer not supported
1414

15-
constraint-set containers-0.7
16-
ghc: >= 9
17-
constraints: containers >= 0.7
18-
tests: True
19-
run-tests: True
15+
-- constraint-set containers-0.7
16+
-- ghc: >= 9
17+
-- constraints: containers >= 0.7
18+
-- tests: True
19+
-- run-tests: True
2020

21-
raw-project
22-
allow-newer: containers
21+
-- raw-project
22+
-- allow-newer: containers

github.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ copyright:
3030
Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016-2021 Oleg Grenrus
3131

3232
tested-with:
33+
GHC == 9.12.0
3334
GHC == 9.10.1
3435
GHC == 9.8.2
3536
GHC == 9.6.6

samples/github-samples.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ description: Various samples of github package
1010
build-type: Simple
1111

1212
tested-with:
13+
GHC == 9.12.0
1314
GHC == 9.10.1
1415
GHC == 9.8.2
1516
GHC == 9.6.6
@@ -40,7 +41,7 @@ executable github-operational
4041
hs-source-dirs: Operational
4142
ghc-options: -Wall -threaded
4243
build-depends:
43-
, base >=0 && <5
44+
, base
4445
, base-compat-batteries
4546
, github
4647
, github-samples
@@ -56,7 +57,7 @@ common deps
5657
-Wall
5758
-threaded
5859
build-depends:
59-
, base >=4.8 && <5
60+
, base
6061
, base-compat-batteries
6162
, base64-bytestring
6263
, github

0 commit comments

Comments
 (0)