Skip to content

Commit 93a9086

Browse files
committed
Bump Haskell CI to GHC 9.14.1
1 parent 1b2f632 commit 93a9086

File tree

2 files changed

+12
-39
lines changed

2 files changed

+12
-39
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 38 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.20250908
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20250908",["github","cpphs.cabal"])
13+
# REGENDATA ("0.19.20260104",["github","cpphs.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -20,6 +20,9 @@ on:
2020
pull_request:
2121
branches:
2222
- master
23+
merge_group:
24+
branches:
25+
- master
2326
jobs:
2427
linux:
2528
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -32,19 +35,19 @@ jobs:
3235
strategy:
3336
matrix:
3437
include:
35-
- compiler: ghc-9.14.0.20250819
38+
- compiler: ghc-9.14.1
3639
compilerKind: ghc
37-
compilerVersion: 9.14.0.20250819
38-
setup-method: ghcup-prerelease
40+
compilerVersion: 9.14.1
41+
setup-method: ghcup
3942
allow-failure: false
4043
- compiler: ghc-9.12.2
4144
compilerKind: ghc
4245
compilerVersion: 9.12.2
4346
setup-method: ghcup
4447
allow-failure: false
45-
- compiler: ghc-9.10.2
48+
- compiler: ghc-9.10.3
4649
compilerKind: ghc
47-
compilerVersion: 9.10.2
50+
compilerVersion: 9.10.3
4851
setup-method: ghcup
4952
allow-failure: false
5053
- compiler: ghc-9.8.4
@@ -131,21 +134,6 @@ jobs:
131134
HCKIND: ${{ matrix.compilerKind }}
132135
HCNAME: ${{ matrix.compiler }}
133136
HCVER: ${{ matrix.compilerVersion }}
134-
- name: Install GHC (GHCup prerelease)
135-
if: matrix.setup-method == 'ghcup-prerelease'
136-
run: |
137-
"$HOME/.ghcup/bin/ghcup" config add-release-channel prereleases
138-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
139-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
140-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
141-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
142-
echo "HC=$HC" >> "$GITHUB_ENV"
143-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
144-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
145-
env:
146-
HCKIND: ${{ matrix.compilerKind }}
147-
HCNAME: ${{ matrix.compiler }}
148-
HCVER: ${{ matrix.compilerVersion }}
149137
- name: Set PATH and environment variables
150138
run: |
151139
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -156,7 +144,7 @@ jobs:
156144
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
157145
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
158146
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
159-
if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
147+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
160148
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
161149
env:
162150
HCKIND: ${{ matrix.compilerKind }}
@@ -184,18 +172,6 @@ jobs:
184172
repository hackage.haskell.org
185173
url: http://hackage.haskell.org/
186174
EOF
187-
if $HEADHACKAGE; then
188-
cat >> $CABAL_CONFIG <<EOF
189-
repository head.hackage.ghc.haskell.org
190-
url: https://ghc.gitlab.haskell.org/head.hackage/
191-
secure: True
192-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
193-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
194-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
195-
key-threshold: 3
196-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
197-
EOF
198-
fi
199175
cat >> $CABAL_CONFIG <<EOF
200176
program-default-options
201177
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -249,9 +225,6 @@ jobs:
249225
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
250226
cat >> cabal.project <<EOF
251227
EOF
252-
if $HEADHACKAGE; then
253-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
254-
fi
255228
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(cpphs)$/; }' >> cabal.project.local
256229
cat cabal.project
257230
cat cabal.project.local

cpphs.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Extra-Doc-Files:
3535
tested-with:
3636
GHC == 9.14.1
3737
GHC == 9.12.2
38-
GHC == 9.10.2
38+
GHC == 9.10.3
3939
GHC == 9.8.4
4040
GHC == 9.6.7
4141
GHC == 9.4.8

0 commit comments

Comments
 (0)