Skip to content

Commit 91904de

Browse files
andreasabelandreasabel
committed
Bump template-haskell bound, update CI to GHC 9.8.1
Closes #300.
1 parent 0b50140 commit 91904de

File tree

9 files changed

+23
-40
lines changed

9 files changed

+23
-40
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.20231002
11+
# version: 0.17.20231012
1212
#
13-
# REGENDATA ("0.17.20231002",["github","cabal.project"])
13+
# REGENDATA ("0.17.20231012",["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.20230929
35+
- compiler: ghc-9.8.1
3636
compilerKind: ghc
37-
compilerVersion: 9.8.0.20230929
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
@@ -276,9 +264,6 @@ jobs:
276264
constraints: base-compat >= 0.12.2
277265
allow-newer: containers
278266
EOF
279-
if $HEADHACKAGE; then
280-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
281-
fi
282267
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(example-client|hackage-repo-tool|hackage-root-tool|hackage-security|hackage-security-HTTP|hackage-security-curl|hackage-security-http-client)$/; }' >> cabal.project.local
283268
cat cabal.project
284269
cat cabal.project.local

‎.github/workflows/haskell.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ on:
44
push:
55
branches:
66
- master
7-
- ci-*
87
pull_request:
98
branches:
109
- master
11-
- ci-*
1210

1311
jobs:
1412
build:
@@ -17,12 +15,12 @@ jobs:
1715
strategy:
1816
fail-fast: false
1917
matrix:
20-
ghc: ['9.6.2', '9.4.5', '9.2.8']
18+
ghc: ['9.8.1', '9.6.3', '9.4.7']
2119
os: [ubuntu-latest, macOS-latest, windows-latest]
2220
steps:
2321
- uses: actions/checkout@v3
2422

25-
- uses: haskell/actions/setup@v2
23+
- uses: haskell-actions/setup@v2
2624
id: setup
2725
with:
2826
ghc-version: ${{ matrix.ghc }}

‎example-client/example-client.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build-type: Simple
1212
cabal-version: >=1.10
1313

1414
tested-with:
15-
GHC == 9.8.0
15+
GHC == 9.8.1
1616
GHC == 9.6.3
1717
GHC == 9.4.7
1818
GHC == 9.2.8

‎hackage-repo-tool/hackage-repo-tool.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ homepage: https://github.com/haskell/hackage-security
2424
bug-reports: https://github.com/haskell/hackage-security/issues
2525

2626
tested-with:
27-
GHC == 9.8.0
27+
GHC == 9.8.1
2828
GHC == 9.6.3
2929
GHC == 9.4.7
3030
GHC == 9.2.8

‎hackage-root-tool/hackage-root-tool.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC == 9.8.0
19+
GHC == 9.8.1
2020
GHC == 9.6.3
2121
GHC == 9.4.7
2222
GHC == 9.2.8

‎hackage-security-HTTP/hackage-security-HTTP.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues
1818
build-type: Simple
1919

2020
tested-with:
21-
GHC == 9.8.0
21+
GHC == 9.8.1
2222
GHC == 9.6.3
2323
GHC == 9.4.7
2424
GHC == 9.2.8

‎hackage-security-curl/hackage-security-curl.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC == 9.8.0
19+
GHC == 9.8.1
2020
GHC == 9.6.3
2121
GHC == 9.4.7
2222
GHC == 9.2.8

‎hackage-security-http-client/hackage-security-http-client.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18-
GHC == 9.8.0
18+
GHC == 9.8.1
1919
GHC == 9.6.3
2020
GHC == 9.4.7
2121
GHC == 9.2.8

‎hackage-security/hackage-security.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 1.12
22
name: hackage-security
33
version: 0.6.2.3
4-
x-revision: 7
4+
x-revision: 8
55

66
synopsis: Hackage security library
77
description: The hackage security library provides both server and
@@ -32,7 +32,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues
3232
build-type: Simple
3333

3434
tested-with:
35-
GHC == 9.8.0
35+
GHC == 9.8.1
3636
GHC == 9.6.3
3737
GHC == 9.4.7
3838
GHC == 9.2.8
@@ -140,7 +140,7 @@ library
140140
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
141141
-- functionality, 0.5.0 changes type of serialise
142142
tar >= 0.5 && < 0.6,
143-
template-haskell >= 2.7 && < 2.21,
143+
template-haskell >= 2.7 && < 2.22,
144144
time >= 1.2 && < 1.13,
145145
transformers >= 0.3 && < 0.7,
146146
zlib >= 0.5 && < 0.7,

0 commit comments

Comments
 (0)