Skip to content

Commit 4445c2f

Browse files
andreasabelandreasabel
committed
Bump base, containers, filepath, network, time, zlib, CI for GHC 9.10
1 parent 514482d commit 4445c2f

File tree

9 files changed

+53
-25
lines changed

9 files changed

+53
-25
lines changed

‎.github/workflows/haskell-ci.yml

+25-5
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.18.1.20240316
11+
# version: 0.19.20240403
1212
#
13-
# REGENDATA ("0.18.1.20240316",["github","cabal.project"])
13+
# REGENDATA ("0.19.20240403",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.10.0.20240328
36+
compilerKind: ghc
37+
compilerVersion: 9.10.0.20240328
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.8.2
3641
compilerKind: ghc
3742
compilerVersion: 9.8.2
@@ -88,7 +93,7 @@ jobs:
8893
chmod a+x "$HOME/.ghcup/bin/ghcup"
8994
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
9095
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
91-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
96+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9297
env:
9398
HCKIND: ${{ matrix.compilerKind }}
9499
HCNAME: ${{ matrix.compiler }}
@@ -106,12 +111,12 @@ jobs:
106111
echo "HC=$HC" >> "$GITHUB_ENV"
107112
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
108113
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
109-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV"
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV"
110115
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
111116
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
112117
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
113118
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
114-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
119+
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
115120
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
116121
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
117122
env:
@@ -140,6 +145,18 @@ jobs:
140145
repository hackage.haskell.org
141146
url: http://hackage.haskell.org/
142147
EOF
148+
if $HEADHACKAGE; then
149+
cat >> $CABAL_CONFIG <<EOF
150+
repository head.hackage.ghc.haskell.org
151+
url: https://ghc.gitlab.haskell.org/head.hackage/
152+
secure: True
153+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
154+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
155+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
156+
key-threshold: 3
157+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
158+
EOF
159+
fi
143160
cat >> $CABAL_CONFIG <<EOF
144161
program-default-options
145162
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -235,6 +252,9 @@ jobs:
235252
constraints: base-compat >= 0.12.2
236253
allow-newer: containers
237254
EOF
255+
if $HEADHACKAGE; then
256+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
257+
fi
238258
$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|precompute-fileinfo)$/; }' >> cabal.project.local
239259
cat cabal.project
240260
cat cabal.project.local

‎example-client/example-client.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ build-type: Simple
1212
cabal-version: >=1.10
1313

1414
tested-with:
15+
GHC == 9.10.0
1516
GHC == 9.8.2
1617
GHC == 9.6.4
1718
GHC == 9.4.8
@@ -31,7 +32,7 @@ executable example-client
3132
main-is: Main.hs
3233
other-modules: ExampleClient.Options
3334

34-
build-depends: base >= 4.11 && < 4.20,
35+
build-depends: base >= 4.11 && < 4.21,
3536
bytestring >= 0.10.8.2,
3637
directory >= 1.3.1.5,
3738
filepath >= 1.4.2,

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ homepage: https://github.com/haskell/hackage-security
2323
bug-reports: https://github.com/haskell/hackage-security/issues
2424

2525
tested-with:
26+
GHC == 9.10.0
2627
GHC == 9.8.2
2728
GHC == 9.6.4
2829
GHC == 9.4.8
@@ -56,13 +57,13 @@ executable hackage-repo-tool
5657

5758
-- For boot libraries we try to accomodate the versions bundled with
5859
-- the respective GHC release
59-
build-depends: base >= 4.11 && < 4.20,
60+
build-depends: base >= 4.11 && < 4.21,
6061
bytestring >= 0.10.8.2 && < 0.13,
6162
directory >= 1.3.1.5 && < 1.4,
62-
filepath >= 1.4.2 && < 1.5,
63+
filepath >= 1.4.2 && < 1.6,
6364
network-uri >= 2.6 && < 2.7,
64-
network >= 2.6 && < 3.2,
65-
time >= 1.8.0.2 && < 1.13
65+
network >= 2.6 && < 3.3,
66+
time >= 1.8.0.2 && < 1.15
6667
if !os(windows)
6768
build-depends: unix >= 2.7.2.2 && < 2.9
6869

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19+
GHC == 9.10.0
1920
GHC == 9.8.2
2021
GHC == 9.6.4
2122
GHC == 9.4.8
@@ -37,7 +38,7 @@ source-repository head
3738
executable hackage-root-tool
3839
main-is: Main.hs
3940
build-depends: base >= 4.11 && < 5,
40-
filepath >= 1.4.2 && < 1.5,
41+
filepath >= 1.4.2 && < 1.6,
4142
optparse-applicative >= 0.13 && < 0.19,
4243
hackage-security >= 0.5 && < 0.7
4344
default-language: Haskell2010

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues
1818
build-type: Simple
1919

2020
tested-with:
21+
GHC == 9.10.0
2122
GHC == 9.8.2
2223
GHC == 9.6.4
2324
GHC == 9.4.8
@@ -37,12 +38,12 @@ source-repository head
3738

3839
library
3940
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
40-
build-depends: base >= 4.11 && < 4.20,
41+
build-depends: base >= 4.11 && < 4.21,
4142
bytestring >= 0.10.8.2 && < 0.13,
4243
HTTP >= 4000.2.19 && < 4000.5,
4344
mtl >= 2.2.2 && < 2.4,
4445
network-uri >= 2.6 && < 2.7,
45-
network >= 2.6 && < 3.2,
46+
network >= 2.6 && < 3.3,
4647
zlib >= 0.5 && < 0.8,
4748
hackage-security >= 0.5 && < 0.7
4849
hs-source-dirs: src

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19+
GHC == 9.10.0
1920
GHC == 9.8.2
2021
GHC == 9.6.4
2122
GHC == 9.4.8
@@ -28,10 +29,10 @@ tested-with:
2829

2930
library
3031
exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl
31-
build-depends: base >= 4.11 && < 4.20,
32+
build-depends: base >= 4.11 && < 4.21,
3233
bytestring >= 0.10.8.2 && < 0.13,
3334
network-uri >= 2.6 && < 2.7,
34-
network >= 2.6 && < 3.2,
35+
network >= 2.6 && < 3.3,
3536
process >= 1.6.3 && < 1.7,
3637
hackage-security >= 0.6.2 && < 0.7
3738
hs-source-dirs: src

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cabal-version: >=1.10
1616
extra-source-files: ChangeLog.md
1717

1818
tested-with:
19+
GHC == 9.10.0
1920
GHC == 9.8.2
2021
GHC == 9.6.4
2122
GHC == 9.4.8
@@ -28,14 +29,14 @@ tested-with:
2829

2930
library
3031
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient
31-
build-depends: base >= 4.11 && < 4.20,
32+
build-depends: base >= 4.11 && < 4.21,
3233
bytestring >= 0.10.8.2 && < 0.13,
3334
http-client >= 0.4 && < 0.8,
3435
http-types >= 0.12.2 && < 0.13,
3536
-- http-types-0.12.2 is the version in Stackage LTS-12.26 (GHC 8.4)
3637
hackage-security >= 0.5 && < 0.7,
3738
network-uri >= 2.6 && < 2.7,
38-
network >= 2.6 && < 3.2
39+
network >= 2.6 && < 3.3
3940
hs-source-dirs: src
4041
default-language: Haskell2010
4142
default-extensions: FlexibleContexts

‎hackage-security/hackage-security.cabal

+5-4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues
3131
build-type: Simple
3232

3333
tested-with:
34+
GHC == 9.10.0
3435
GHC == 9.8.2
3536
GHC == 9.6.4
3637
GHC == 9.4.8
@@ -104,25 +105,25 @@ library
104105
Hackage.Security.Util.Stack
105106
Hackage.Security.Util.TypedEmbedded
106107

107-
build-depends: base >= 4.11 && < 4.20,
108+
build-depends: base >= 4.11 && < 4.21,
108109
base16-bytestring >= 0.1.1 && < 1.1,
109110
base64-bytestring >= 1.0 && < 1.3,
110111
bytestring >= 0.10.8.2 && < 0.13,
111112
containers >= 0.5.11 && < 0.8,
112113
cryptohash-sha256 >= 0.11 && < 0.12,
113114
directory >= 1.3.1.5 && < 1.4,
114115
ed25519 >= 0.0 && < 0.1,
115-
filepath >= 1.4.2 && < 1.5,
116+
filepath >= 1.4.2 && < 1.6,
116117
mtl >= 2.2.2 && < 2.4,
117118
network-uri >= 2.6 && < 2.7,
118-
network >= 2.6 && < 3.2,
119+
network >= 2.6 && < 3.3,
119120
parsec >= 3.1.13 && < 3.2,
120121
pretty >= 1.0 && < 1.2,
121122
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
122123
-- functionality, 0.5.0 changes type of serialise
123124
tar >= 0.5 && < 0.7,
124125
template-haskell >= 2.13 && < 2.22,
125-
time >= 1.8.0.2 && < 1.13,
126+
time >= 1.8.0.2 && < 1.15,
126127
transformers >= 0.3 && < 0.7,
127128
zlib >= 0.5 && < 0.8,
128129
-- whatever versions are bundled with ghc:

‎precompute-fileinfo/precompute-fileinfo.cabal

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18+
GHC == 9.10.0
1819
GHC == 9.8.2
1920
GHC == 9.6.4
2021
GHC == 9.4.8
@@ -27,16 +28,16 @@ tested-with:
2728

2829
executable precompute-fileinfo
2930
main-is: Main.hs
30-
build-depends: base >= 4.11 && < 4.20,
31+
build-depends: base >= 4.11 && < 4.21,
3132
bytestring >= 0.10.8.2 && < 0.13,
32-
containers >= 0.5.11 && < 0.7,
33+
containers >= 0.5.11 && < 0.8,
3334
deepseq >= 1.4.3 && < 1.6,
34-
filepath >= 1.4.2 && < 1.5,
35+
filepath >= 1.4.2 && < 1.6,
3536
optparse-applicative >= 0.13 && < 0.19,
3637
SHA >= 1.6.4 && < 1.7,
3738
tar >= 0.5.0.2 && < 0.7,
3839
-- tar-0.5.0.2 is the version in Stackage LTS-12.26 (GHC 8.4)
39-
zlib >= 0.6.2 && < 0.7
40+
zlib >= 0.6.2 && < 0.8
4041
-- zlib-0.6.2 is the version in Stackage LTS-12.26 (GHC 8.4)
4142
hs-source-dirs: src
4243
default-language: Haskell2010

0 commit comments

Comments
 (0)