Skip to content

Commit c77bfa2

Browse files
committed
Allow bytestring-0.12 and test it in CI
1 parent a8a7458 commit c77bfa2

File tree

5 files changed

+35
-6
lines changed

5 files changed

+35
-6
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ jobs:
284284
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
285285
cat >> cabal.project <<EOF
286286
constraints: base-compat >= 0.12.2
287+
allow-newer: bytestring
287288
EOF
288289
if $HEADHACKAGE; then
289290
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
@@ -340,6 +341,11 @@ jobs:
340341
- name: prepare for constraint sets
341342
run: |
342343
rm -f cabal.project.local
344+
- name: constraint set bytestring-0.12
345+
run: |
346+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --dependencies-only -j2 all ; fi
347+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
348+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
343349
- name: constraint set no-lukko
344350
run: |
345351
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' --dependencies-only -j2 all ; fi

cabal.haskell-ci

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,30 @@ haddock: >= 8.6
1515
raw-project
1616
constraints:
1717
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
1828

1929
constraint-set no-lukko
2030
ghc: >=8.2
2131
constraints: hackage-security -lukko
32+
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+
--
43+
tests: True
44+
run-tests: True

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

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

66
build-type: Simple
77
synopsis: Manage secure file-based package repositories
@@ -72,7 +72,7 @@ executable hackage-repo-tool
7272
-- For boot libraries we try to accomodate the versions bundled with
7373
-- the respective GHC release
7474
build-depends: base >= 4.5 && < 4.19,
75-
bytestring >= 0.9 && < 0.12,
75+
bytestring >= 0.9 && < 0.13,
7676
directory >= 1.1 && < 1.4,
7777
filepath >= 1.3 && < 1.5,
7878
time >= 1.4 && < 1.13

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

Lines changed: 2 additions & 2 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: 5
4+
x-revision: 6
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
@@ -47,7 +47,7 @@ flag use-network-uri
4747
library
4848
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
4949
build-depends: base >= 4.5 && < 4.19,
50-
bytestring >= 0.9 && < 0.12,
50+
bytestring >= 0.9 && < 0.13,
5151
HTTP >= 4000.2.19 && < 4000.5,
5252
mtl >= 2.1 && < 2.4,
5353
zlib >= 0.5 && < 0.7,

hackage-security/hackage-security.cabal

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

66
synopsis: Hackage security library
77
description: The hackage security library provides both server and
@@ -132,7 +132,7 @@ library
132132
build-depends: base >= 4.5 && < 4.19,
133133
base16-bytestring >= 0.1.1 && < 1.1,
134134
base64-bytestring >= 1.0 && < 1.3,
135-
bytestring >= 0.9 && < 0.12,
135+
bytestring >= 0.9 && < 0.13,
136136
containers >= 0.4 && < 0.7,
137137
ed25519 >= 0.0 && < 0.1,
138138
filepath >= 1.2 && < 1.5,

0 commit comments

Comments
 (0)