Skip to content

Commit 6b9716c

Browse files
committed
Bump Haskell-CI to GHC 9.8.1
1 parent c0ce867 commit 6b9716c

File tree

3 files changed

+14
-29
lines changed

3 files changed

+14
-29
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 27 deletions
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",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.17.20231012",["--config=cabal.haskell-ci","github","cabal.project"])
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
@@ -65,27 +65,27 @@ jobs:
6565
- compiler: ghc-8.8.4
6666
compilerKind: ghc
6767
compilerVersion: 8.8.4
68-
setup-method: hvr-ppa
68+
setup-method: ghcup
6969
allow-failure: false
7070
- compiler: ghc-8.6.5
7171
compilerKind: ghc
7272
compilerVersion: 8.6.5
73-
setup-method: hvr-ppa
73+
setup-method: ghcup
7474
allow-failure: false
7575
- compiler: ghc-8.4.4
7676
compilerKind: ghc
7777
compilerVersion: 8.4.4
78-
setup-method: hvr-ppa
78+
setup-method: ghcup
7979
allow-failure: false
8080
- compiler: ghc-8.2.2
8181
compilerKind: ghc
8282
compilerVersion: 8.2.2
83-
setup-method: hvr-ppa
83+
setup-method: ghcup
8484
allow-failure: false
8585
- compiler: ghc-8.0.2
8686
compilerKind: ghc
8787
compilerVersion: 8.0.2
88-
setup-method: hvr-ppa
88+
setup-method: ghcup
8989
allow-failure: false
9090
- compiler: ghc-7.10.3
9191
compilerKind: ghc
@@ -97,7 +97,7 @@ jobs:
9797
- name: apt
9898
run: |
9999
apt-get update
100-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
100+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101101
if [ "${{ matrix.setup-method }}" = ghcup ]; then
102102
mkdir -p "$HOME/.ghcup/bin"
103103
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
@@ -146,7 +146,7 @@ jobs:
146146
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
147147
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
148148
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
149-
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
149+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
150150
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
151151
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
152152
env:
@@ -175,18 +175,6 @@ jobs:
175175
repository hackage.haskell.org
176176
url: http://hackage.haskell.org/
177177
EOF
178-
if $HEADHACKAGE; then
179-
cat >> $CABAL_CONFIG <<EOF
180-
repository head.hackage.ghc.haskell.org
181-
url: https://ghc.gitlab.haskell.org/head.hackage/
182-
secure: True
183-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
184-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
185-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
186-
key-threshold: 3
187-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
188-
EOF
189-
fi
190178
cat >> $CABAL_CONFIG <<EOF
191179
program-default-options
192180
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -249,9 +237,6 @@ jobs:
249237
optimization: False
250238
allow-newer: containers
251239
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
255240
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(github|github-samples)$/; }' >> cabal.project.local
256241
cat cabal.project
257242
cat cabal.project.local

github.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ copyright:
3131
Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016-2021 Oleg Grenrus
3232

3333
tested-with:
34-
GHC == 9.8.0
34+
GHC == 9.8.1
3535
GHC == 9.6.3
3636
GHC == 9.4.7
3737
GHC == 9.2.8

samples/github-samples.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: Various samples of github package
1010
build-type: Simple
1111

1212
tested-with:
13-
GHC == 9.8.0
13+
GHC == 9.8.1
1414
GHC == 9.6.3
1515
GHC == 9.4.7
1616
GHC == 9.2.8

0 commit comments

Comments
 (0)