Skip to content

Commit 51505fc

Browse files
committed
Regenerate CI
1 parent 1058f13 commit 51505fc

File tree

4 files changed

+34
-11
lines changed

4 files changed

+34
-11
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 25 additions & 5 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.20250917
11+
# version: 0.19.20260102
1212
#
13-
# REGENDATA ("0.19.20250917",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20260102",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -29,14 +29,19 @@ jobs:
2929
strategy:
3030
matrix:
3131
include:
32+
- compiler: ghc-9.14.1
33+
compilerKind: ghc
34+
compilerVersion: 9.14.1
35+
setup-method: ghcup
36+
allow-failure: false
3237
- compiler: ghc-9.12.2
3338
compilerKind: ghc
3439
compilerVersion: 9.12.2
3540
setup-method: ghcup
3641
allow-failure: false
37-
- compiler: ghc-9.10.2
42+
- compiler: ghc-9.10.3
3843
compilerKind: ghc
39-
compilerVersion: 9.10.2
44+
compilerVersion: 9.10.3
4045
setup-method: ghcup
4146
allow-failure: false
4247
- compiler: ghc-9.8.4
@@ -133,7 +138,7 @@ jobs:
133138
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
134139
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
135140
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
136-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
141+
if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
137142
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
138143
env:
139144
HCKIND: ${{ matrix.compilerKind }}
@@ -161,6 +166,18 @@ jobs:
161166
repository hackage.haskell.org
162167
url: http://hackage.haskell.org/
163168
EOF
169+
if $HEADHACKAGE; then
170+
cat >> $CABAL_CONFIG <<EOF
171+
repository head.hackage.ghc.haskell.org
172+
url: https://ghc.gitlab.haskell.org/head.hackage/
173+
secure: True
174+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
175+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
176+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
177+
key-threshold: 3
178+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
179+
EOF
180+
fi
164181
cat >> $CABAL_CONFIG <<EOF
165182
program-default-options
166183
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -244,6 +261,9 @@ jobs:
244261
package criterion-examples
245262
ghc-options: -Werror
246263
EOF
264+
if $HEADHACKAGE; then
265+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
266+
fi
247267
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(criterion|criterion-examples|criterion-measurement)$/; }' >> cabal.project.local
248268
cat cabal.project
249269
cat cabal.project.local

criterion-measurement/criterion-measurement.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ tested-with:
2424
GHC==9.4.8,
2525
GHC==9.6.7,
2626
GHC==9.8.4,
27-
GHC==9.10.2,
28-
GHC==9.12.2
27+
GHC==9.10.3,
28+
GHC==9.12.2,
29+
GHC==9.14.1
2930

3031
flag fast
3132
description: compile without optimizations

criterion.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ tested-with:
3232
GHC==9.4.8,
3333
GHC==9.6.7,
3434
GHC==9.8.4,
35-
GHC==9.10.2,
36-
GHC==9.12.2
35+
GHC==9.10.3,
36+
GHC==9.12.2,
37+
GHC==9.14.1
3738

3839
data-files:
3940
templates/*.css

examples/criterion-examples.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ tested-with:
2222
GHC==9.4.8,
2323
GHC==9.6.7,
2424
GHC==9.8.4,
25-
GHC==9.10.2,
26-
GHC==9.12.2
25+
GHC==9.10.3,
26+
GHC==9.12.2,
27+
GHC==9.14.1
2728

2829
flag conduit-vs-pipes
2930
default: True

0 commit comments

Comments
 (0)