Skip to content

Commit 3fc9d3c

Browse files
phadejphadej
authored
Merge pull request #647 from haskell-CI/ghc-9.6
Add GHC-9.6 and cabal-install-3.10
2 parents 1f97531 + 55f7a11 commit 3fc9d3c

27 files changed

+402
-492
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ jobs:
7979
mkdir -p "$HOME/.ghcup/bin"
8080
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
8181
chmod a+x "$HOME/.ghcup/bin/ghcup"
82-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
8382
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
84-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
83+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8584
env:
8685
HCKIND: ${{ matrix.compilerKind }}
8786
HCNAME: ${{ matrix.compiler }}
@@ -97,7 +96,7 @@ jobs:
9796
echo "HC=$HC" >> "$GITHUB_ENV"
9897
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
9998
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
100-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
99+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
101100
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
102101
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
103102
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HC ?= ghc-8.6.5
1+
HC ?= ghc-9.2.7
22

33
build :
44
cabal v2-build -w $(HC)

‎fixtures/all-versions.github

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ jobs:
3333
compilerVersion: "8.4"
3434
setup-method: hvr-ppa
3535
allow-failure: false
36-
- compiler: ghc-9.6.0.20230302
36+
- compiler: ghc-9.6.1
3737
compilerKind: ghc
38-
compilerVersion: 9.6.0.20230302
38+
compilerVersion: 9.6.1
3939
setup-method: ghcup
40-
allow-failure: true
40+
allow-failure: false
4141
- compiler: ghc-9.4.4
4242
compilerKind: ghc
4343
compilerVersion: 9.4.4
@@ -336,9 +336,8 @@ jobs:
336336
mkdir -p "$HOME/.ghcup/bin"
337337
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
338338
chmod a+x "$HOME/.ghcup/bin/ghcup"
339-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
340339
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
341-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
340+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
342341
else
343342
apt-add-repository -y 'ppa:hvr/ghc'
344343
if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
@@ -349,8 +348,7 @@ jobs:
349348
mkdir -p "$HOME/.ghcup/bin"
350349
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
351350
chmod a+x "$HOME/.ghcup/bin/ghcup"
352-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
353-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
351+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
354352
fi
355353
env:
356354
HCKIND: ${{ matrix.compilerKind }}
@@ -369,20 +367,20 @@ jobs:
369367
echo "HC=$HC" >> "$GITHUB_ENV"
370368
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
371369
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
372-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
370+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
373371
else
374372
HC=$HCDIR/bin/$HCKIND
375373
echo "HC=$HC" >> "$GITHUB_ENV"
376374
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
377375
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
378-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
376+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
379377
fi
380378

381379
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
382380
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
383381
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
384382
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
385-
if [ $((! GHCJSARITH && HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
383+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
386384
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
387385
env:
388386
HCKIND: ${{ matrix.compilerKind }}
@@ -410,18 +408,6 @@ jobs:
410408
repository hackage.haskell.org
411409
url: http://hackage.haskell.org/
412410
EOF
413-
if $HEADHACKAGE; then
414-
cat >> $CABAL_CONFIG <<EOF
415-
repository head.hackage.ghc.haskell.org
416-
url: https://ghc.gitlab.haskell.org/head.hackage/
417-
secure: True
418-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
419-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
420-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
421-
key-threshold: 3
422-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
423-
EOF
424-
fi
425411
cat >> $CABAL_CONFIG <<EOF
426412
program-default-options
427413
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -475,9 +461,6 @@ jobs:
475461
if [ $((GHCJSARITH || ! GHCJSARITH && HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
476462
cat >> cabal.project <<EOF
477463
EOF
478-
if $HEADHACKAGE; then
479-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
480-
fi
481464
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(splitmix)$/; }' >> cabal.project.local
482465
cat cabal.project
483466
cat cabal.project.local

0 commit comments

Comments
 (0)