Skip to content

Commit 24c553d

Browse files
committedOct 25, 2023
Bump CI to GHC 9.8.1
1 parent 15bf232 commit 24c553d

File tree

3 files changed

+17
-33
lines changed

3 files changed

+17
-33
lines changed
 

‎.github/workflows/haskell-ci.yml

+13-28
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.17.20230928
11+
# version: 0.17.20231012
1212
#
13-
# REGENDATA ("0.17.20230928",["github","resolv.cabal"])
13+
# REGENDATA ("0.17.20231012",["github","resolv.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,11 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.0.20230919
35+
- compiler: ghc-9.8.1
3636
compilerKind: ghc
37-
compilerVersion: 9.8.0.20230919
37+
compilerVersion: 9.8.1
3838
setup-method: ghcup
39-
allow-failure: true
39+
allow-failure: false
4040
- compiler: ghc-9.6.3
4141
compilerKind: ghc
4242
compilerVersion: 9.6.3
@@ -121,7 +121,7 @@ jobs:
121121
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122122
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123123
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124-
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
124+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125125
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
126126
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
127127
env:
@@ -150,18 +150,6 @@ jobs:
150150
repository hackage.haskell.org
151151
url: http://hackage.haskell.org/
152152
EOF
153-
if $HEADHACKAGE; then
154-
cat >> $CABAL_CONFIG <<EOF
155-
repository head.hackage.ghc.haskell.org
156-
url: https://ghc.gitlab.haskell.org/head.hackage/
157-
secure: True
158-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
159-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
160-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
161-
key-threshold: 3
162-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
163-
EOF
164-
fi
165153
cat >> $CABAL_CONFIG <<EOF
166154
program-default-options
167155
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -215,11 +203,8 @@ jobs:
215203
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package resolv" >> cabal.project ; fi
216204
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
217205
cat >> cabal.project <<EOF
218-
allow-newer: bytestring
206+
allow-newer: containers
219207
EOF
220-
if $HEADHACKAGE; then
221-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
222-
fi
223208
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(binary|resolv)$/; }' >> cabal.project.local
224209
cat cabal.project
225210
cat cabal.project.local
@@ -260,13 +245,13 @@ jobs:
260245
- name: prepare for constraint sets
261246
run: |
262247
rm -f cabal.project.local
263-
- name: constraint set latest-core-libs-Sep-2023
248+
- name: constraint set containers-0.7
264249
run: |
265-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' all --dry-run ; fi
266-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
267-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' --dependencies-only -j2 all ; fi
268-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' all ; fi
269-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' all ; fi
250+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all --dry-run ; fi
251+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
252+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' --dependencies-only -j2 all ; fi
253+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
254+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
270255
- name: save cache
271256
uses: actions/cache/save@v3
272257
if: always()

‎cabal.haskell-ci

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ ghcup-jobs: True
99
installed: +all -binary
1010

1111
-- Test core libraries in versions newer than shipped with GHC
12-
constraint-set latest-core-libs-Sep-2023
13-
constraints: bytestring >= 0.12
12+
constraint-set containers-0.7
1413
constraints: containers >= 0.7
15-
ghc: >= 8.2 && < 9.7
14+
ghc: >= 8.2
1615
tests: True
1716
run-tests: True
1817

1918
raw-project
20-
allow-newer: bytestring
19+
allow-newer: containers

‎resolv.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extra-tmp-files: autom4te.cache
5656
cbits/hs_resolv_config.h
5757

5858
tested-with:
59-
GHC == 9.8.0
59+
GHC == 9.8.1
6060
GHC == 9.6.3
6161
GHC == 9.4.7
6262
GHC == 9.2.8

0 commit comments

Comments
 (0)
Please sign in to comment.