Skip to content

Commit 0b50140

Browse files
andreasabelandreasabel
committed
Bumps: allow base-4.19 (GHC 9.8), containers-0.7
1 parent e8c3f38 commit 0b50140

File tree

10 files changed

+49
-54
lines changed

10 files changed

+49
-54
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 17 additions & 12 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.20230911
11+
# version: 0.17.20231002
1212
#
13-
# REGENDATA ("0.17.20230911",["github","cabal.project"])
13+
# REGENDATA ("0.17.20231002",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,9 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.6.2
35+
- compiler: ghc-9.8.0.20230929
3636
compilerKind: ghc
37-
compilerVersion: 9.6.2
37+
compilerVersion: 9.8.0.20230929
38+
setup-method: ghcup
39+
allow-failure: true
40+
- compiler: ghc-9.6.3
41+
compilerKind: ghc
42+
compilerVersion: 9.6.3
3843
setup-method: ghcup
3944
allow-failure: false
4045
- compiler: ghc-9.4.7
@@ -141,7 +146,7 @@ jobs:
141146
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
142147
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
143148
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
144-
if [ $((HCNUMVER > 90602)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
149+
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
145150
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
146151
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
147152
env:
@@ -269,7 +274,7 @@ jobs:
269274
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
270275
cat >> cabal.project <<EOF
271276
constraints: base-compat >= 0.12.2
272-
allow-newer: bytestring
277+
allow-newer: containers
273278
EOF
274279
if $HEADHACKAGE; then
275280
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
@@ -326,13 +331,13 @@ jobs:
326331
- name: prepare for constraint sets
327332
run: |
328333
rm -f cabal.project.local
329-
- name: constraint set bytestring-0.12
334+
- name: constraint set containers-0.7
330335
run: |
331-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all --dry-run ; fi
332-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
333-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --dependencies-only -j2 all ; fi
334-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
335-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
336+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all --dry-run ; fi
337+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
338+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' --dependencies-only -j2 all ; fi
339+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
340+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
336341
- name: constraint set no-lukko
337342
run: |
338343
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' all --dry-run ; fi

‎cabal.haskell-ci

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
branches: master
22

3-
ghc-head: True
4-
53
-- Andreas, 2023-07-01: We use some haddock features that are new in 8.6.
64
haddock: >= 8.6
75

@@ -15,30 +13,15 @@ haddock: >= 8.6
1513
raw-project
1614
constraints:
1715
base-compat >= 0.12.2
18-
--
19-
-- The following is meant to be for constraint-set bytestring-0.12 only,
20-
-- but there is currently no way to enable `allow-newer: bytestring`
21-
-- just for the constraint set.
22-
--
23-
-- Since core library `bytestring` is constrained to `installed`,
24-
-- it is not harmful to allow newer `bytestring` in the default runs
25-
-- as well---it will have no effect there.
26-
--
27-
allow-newer: bytestring
2816

2917
constraint-set no-lukko
3018
ghc: >=8.2
3119
constraints: hackage-security -lukko
3220

33-
constraint-set bytestring-0.12
34-
-- bytestring-0.12 requires base >=4.9 (GHC 8.0)
35-
ghc: >= 8.0
36-
constraints: bytestring >= 0.12
37-
--
38-
-- The following is silently ignored here:
39-
--
40-
-- raw-project
41-
-- allow-newer: bytestring
42-
--
21+
constraint-set containers-0.7
22+
ghc: >= 8.2 && < 9.8
23+
constraints: containers >= 0.7
4324
tests: True
44-
run-tests: True
25+
run-tests: True
26+
raw-project
27+
allow-newer: containers

‎example-client/example-client.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ build-type: Simple
1212
cabal-version: >=1.10
1313

1414
tested-with:
15-
GHC == 9.6.2
15+
GHC == 9.8.0
16+
GHC == 9.6.3
1617
GHC == 9.4.7
1718
GHC == 9.2.8
1819
GHC == 9.0.2
@@ -37,7 +38,7 @@ executable example-client
3738
main-is: Main.hs
3839
other-modules: Prelude ExampleClient.Options
3940

40-
build-depends: base >= 4.5 && < 4.19,
41+
build-depends: base >= 4.5 && < 4.20,
4142
bytestring >= 0.9,
4243
directory >= 1.1,
4344
filepath >= 1.2,

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

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

66
build-type: Simple
77
synopsis: Manage secure file-based package repositories
@@ -24,7 +24,8 @@ homepage: https://github.com/haskell/hackage-security
2424
bug-reports: https://github.com/haskell/hackage-security/issues
2525

2626
tested-with:
27-
GHC == 9.6.2
27+
GHC == 9.8.0
28+
GHC == 9.6.3
2829
GHC == 9.4.7
2930
GHC == 9.2.8
3031
GHC == 9.0.2
@@ -68,7 +69,7 @@ executable hackage-repo-tool
6869

6970
-- For boot libraries we try to accomodate the versions bundled with
7071
-- the respective GHC release
71-
build-depends: base >= 4.5 && < 4.19,
72+
build-depends: base >= 4.5 && < 4.20,
7273
bytestring >= 0.9 && < 0.13,
7374
directory >= 1.1 && < 1.4,
7475
filepath >= 1.3 && < 1.5,

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

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

1818
tested-with:
19-
GHC == 9.6.2
19+
GHC == 9.8.0
20+
GHC == 9.6.3
2021
GHC == 9.4.7
2122
GHC == 9.2.8
2223
GHC == 9.0.2

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 1.12
22
name: hackage-security-HTTP
33
version: 0.1.1.1
4-
x-revision: 6
4+
x-revision: 7
55
synopsis: Hackage security bindings against the HTTP library
66
description: The hackage security library provides a 'HttpLib'
77
abstraction to allow to bind against different HTTP
@@ -18,7 +18,8 @@ bug-reports: https://github.com/haskell/hackage-security/issues
1818
build-type: Simple
1919

2020
tested-with:
21-
GHC == 9.6.2
21+
GHC == 9.8.0
22+
GHC == 9.6.3
2223
GHC == 9.4.7
2324
GHC == 9.2.8
2425
GHC == 9.0.2
@@ -43,7 +44,7 @@ flag use-network-uri
4344

4445
library
4546
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
46-
build-depends: base >= 4.5 && < 4.19,
47+
build-depends: base >= 4.5 && < 4.20,
4748
bytestring >= 0.9 && < 0.13,
4849
HTTP >= 4000.2.19 && < 4000.5,
4950
mtl >= 2.1 && < 2.4,

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC == 9.6.2
19+
GHC == 9.8.0
20+
GHC == 9.6.3
2021
GHC == 9.4.7
2122
GHC == 9.2.8
2223
GHC == 9.0.2
@@ -34,7 +35,7 @@ flag use-network-uri
3435

3536
library
3637
exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl
37-
build-depends: base >= 4.5 && < 4.19,
38+
build-depends: base >= 4.5 && < 4.20,
3839
bytestring >= 0.9,
3940
process >= 1.1,
4041
hackage-security

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18-
GHC == 9.6.2
18+
GHC == 9.8.0
19+
GHC == 9.6.3
1920
GHC == 9.4.7
2021
GHC == 9.2.8
2122
GHC == 9.0.2
@@ -33,7 +34,7 @@ flag use-network-uri
3334

3435
library
3536
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient
36-
build-depends: base >= 4.5 && < 4.19,
37+
build-depends: base >= 4.5 && < 4.20,
3738
bytestring >= 0.9,
3839
http-client >= 0.4 && < 0.8,
3940
http-types >= 0.8,

‎hackage-security/hackage-security.cabal

Lines changed: 5 additions & 4 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: 6
4+
x-revision: 7
55

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

3434
tested-with:
35-
GHC == 9.6.2
35+
GHC == 9.8.0
36+
GHC == 9.6.3
3637
GHC == 9.4.7
3738
GHC == 9.2.8
3839
GHC == 9.0.2
@@ -126,11 +127,11 @@ library
126127
Hackage.Security.Util.TypedEmbedded
127128
MyPrelude
128129
-- We support ghc 7.4 (bundled with Cabal 1.14) and up
129-
build-depends: base >= 4.5 && < 4.19,
130+
build-depends: base >= 4.5 && < 4.20,
130131
base16-bytestring >= 0.1.1 && < 1.1,
131132
base64-bytestring >= 1.0 && < 1.3,
132133
bytestring >= 0.9 && < 0.13,
133-
containers >= 0.4 && < 0.7,
134+
containers >= 0.4 && < 0.8,
134135
ed25519 >= 0.0 && < 0.1,
135136
filepath >= 1.2 && < 1.5,
136137
parsec >= 3.1 && < 3.2,

‎precompute-fileinfo/precompute-fileinfo.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
18+
GHC==9.6.3, GHC==9.4.5, GHC==9.2.8, GHC==9.0.2,
1919
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
20-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
20+
GHC==7.10.3
2121

2222
executable precompute-fileinfo
2323
main-is: Main.hs

0 commit comments

Comments
 (0)