Skip to content

Commit 28a80fc

Browse files
committed
Test with GHC 9.14.1
1 parent 012af2c commit 28a80fc

3 files changed

Lines changed: 26 additions & 49 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 17 additions & 42 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.20250821
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20250821",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20260104",["github","--config=cabal.haskell-ci","cabal.project"])
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,10 +35,10 @@ 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
@@ -106,21 +109,6 @@ jobs:
106109
HCKIND: ${{ matrix.compilerKind }}
107110
HCNAME: ${{ matrix.compiler }}
108111
HCVER: ${{ matrix.compilerVersion }}
109-
- name: Install GHC (GHCup prerelease)
110-
if: matrix.setup-method == 'ghcup-prerelease'
111-
run: |
112-
"$HOME/.ghcup/bin/ghcup" config add-release-channel prereleases
113-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
114-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
115-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
116-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
117-
echo "HC=$HC" >> "$GITHUB_ENV"
118-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
119-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
120-
env:
121-
HCKIND: ${{ matrix.compilerKind }}
122-
HCNAME: ${{ matrix.compiler }}
123-
HCVER: ${{ matrix.compilerVersion }}
124112
- name: Set PATH and environment variables
125113
run: |
126114
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -131,7 +119,7 @@ jobs:
131119
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
132120
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
133121
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
134-
if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
122+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
135123
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
136124
env:
137125
HCKIND: ${{ matrix.compilerKind }}
@@ -159,18 +147,6 @@ jobs:
159147
repository hackage.haskell.org
160148
url: http://hackage.haskell.org/
161149
EOF
162-
if $HEADHACKAGE; then
163-
cat >> $CABAL_CONFIG <<EOF
164-
repository head.hackage.ghc.haskell.org
165-
url: https://ghc.gitlab.haskell.org/head.hackage/
166-
secure: True
167-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
168-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
169-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
170-
key-threshold: 3
171-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
172-
EOF
173-
fi
174150
cat >> $CABAL_CONFIG <<EOF
175151
program-default-options
176152
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -187,7 +163,7 @@ jobs:
187163
- name: cache (tools)
188164
uses: actions/cache/restore@v4
189165
with:
190-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-28109522
166+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e7451788
191167
path: ~/.haskell-ci-tools
192168
- name: install cabal-plan
193169
run: |
@@ -206,10 +182,10 @@ jobs:
206182
if: always()
207183
uses: actions/cache/save@v4
208184
with:
209-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-28109522
185+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e7451788
210186
path: ~/.haskell-ci-tools
211187
- name: checkout
212-
uses: actions/checkout@v4
188+
uses: actions/checkout@v5
213189
with:
214190
path: source
215191
- name: initial cabal.project for sdist
@@ -274,10 +250,12 @@ jobs:
274250
allow-newer: freer-simple:*
275251
allow-newer: fused-effects:*
276252
allow-newer: polysemy:*
277-
allow-newer: *:base
278-
allow-newer: *:containers
279-
allow-newer: *:template-haskell
253+
allow-newer: async:base
254+
allow-newer: hashable:base
255+
allow-newer: hashable:containers
280256
allow-newer: hashable:ghc-bignum
257+
allow-newer: tagged:template-haskell
258+
allow-newer: th-abstraction:template-haskell
281259
282260
package effectful-core
283261
ghc-options: -Werror
@@ -292,9 +270,6 @@ jobs:
292270
ghc-options: -Werror
293271
flags: +benchmark-foreign-libraries
294272
EOF
295-
if $HEADHACKAGE; then
296-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
297-
fi
298273
cat cabal.project
299274
cat cabal.project.local
300275
- name: dump install plan

cabal.project

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ allow-newer: cleff:*
1111
, polysemy:*
1212

1313
-- ghc-9.14
14-
allow-newer: *:base
15-
, *:containers
16-
, *:template-haskell
14+
allow-newer: async:base
15+
, hashable:base
16+
, hashable:containers
1717
, hashable:ghc-bignum
18+
, tagged:template-haskell
19+
, th-abstraction:template-haskell

effectful/effectful.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,16 +183,16 @@ benchmark bench
183183
if flag(benchmark-foreign-libraries)
184184
build-depends: mtl
185185

186-
if impl(ghc < 9.9)
186+
if impl(ghc <= 9.8)
187187
build-depends: cleff >= 0.3.3.0
188188

189-
if impl(ghc < 9.9)
189+
if impl(ghc <= 9.8)
190190
build-depends: freer-simple >= 1.2.1.2
191191

192-
if impl(ghc < 9.15)
192+
if impl(ghc <= 9.12)
193193
build-depends: fused-effects >= 1.1.2.3
194194

195-
if impl(ghc < 9.15)
195+
if impl(ghc <= 9.12)
196196
build-depends: polysemy >= 1.9.2.0
197197

198198
build-depends: base

0 commit comments

Comments
 (0)