Skip to content

Commit 53f8997

Browse files
committed
v0.8.2.1-r1: allow newer containers, drop dependencies before LTS 7.24
We support GHC 8.0 and up, so we can raise the lower bounds of some dependencies.
1 parent b81b96c commit 53f8997

File tree

3 files changed

+39
-15
lines changed

3 files changed

+39
-15
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ jobs:
235235
cat >> cabal.project <<EOF
236236
package libxml
237237
extra-include-dirs: /usr/include/libxml2
238+
239+
allow-newer: containers
238240
EOF
239241
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(test-framework|test-framework-example|test-framework-hunit|test-framework-quickcheck2)$/; }' >> cabal.project.local
240242
cat cabal.project
@@ -279,6 +281,16 @@ jobs:
279281
run: |
280282
rm -f cabal.project.local
281283
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
284+
- name: prepare for constraint sets
285+
run: |
286+
rm -f cabal.project.local
287+
- name: constraint set containers-0.8
288+
run: |
289+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all --dry-run ; fi
290+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
291+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' --dependencies-only -j2 all ; fi
292+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all ; fi
293+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all ; fi
282294
- name: save cache
283295
if: always()
284296
uses: actions/cache/save@v4

cabal.haskell-ci

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ raw-project
66
-- On Debian/Ubuntu you may need the following to workaround an issue in libxml's packaging
77
package libxml
88
extra-include-dirs: /usr/include/libxml2
9+
10+
constraint-set containers-0.8
11+
ghc: >= 8.2
12+
constraints: containers ^>=0.8
13+
tests: True
14+
run-tests: True
15+
16+
raw-project
17+
allow-newer: containers

core/test-framework.cabal

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Cabal-Version: 1.18
22
Name: test-framework
33
Version: 0.8.2.1
4+
x-revision: 1
45
Category: Testing
56
Synopsis: Framework for running and organising tests, with HUnit and QuickCheck support
67
Description: Allows tests such as QuickCheck properties and HUnit test cases to be assembled into test groups, run in
@@ -59,16 +60,17 @@ Library
5960
Test.Framework.Runners.XML
6061
Test.Framework.Utilities
6162

62-
Build-Depends: base >= 4.9 && < 5
63-
, ansi-terminal >= 0.4.0 && < 1.2
64-
, ansi-wl-pprint >= 0.6.7 && < 1.1
65-
, random >= 1.1 && < 1.4
66-
, containers >= 0.1 && < 0.8
67-
, regex-posix >= 0.72 && < 0.97
68-
, old-locale >= 1.0 && < 1.1
69-
, time >= 1.6 && < 1.15
70-
, xml >= 1.3.5 && < 1.4
71-
, hostname >= 1.0 && < 1.1
63+
-- Lower bounds picked from LTS-7.24 (GHC 8.0.1)
64+
Build-Depends: base >= 4.9 && < 5
65+
, ansi-terminal >= 0.6.3 && < 1.2
66+
, ansi-wl-pprint >= 0.6.7 && < 1.1
67+
, random >= 1.1 && < 1.4
68+
, containers >= 0.5.7 && < 1
69+
, regex-posix >= 0.95.2 && < 0.97
70+
, old-locale >= 1.0 && < 1.1
71+
, time >= 1.6 && < 1.15
72+
, xml >= 1.3.14 && < 1.4
73+
, hostname >= 1.0 && < 1.1
7274

7375
Default-Language: Haskell2010
7476
Default-Extensions: CPP
@@ -111,20 +113,21 @@ Test-Suite test-framework-tests
111113
-- Doe to libxml dependency, the testsuite is not buildable on e.g. MacOS
112114
-- Buildable: False
113115

116+
-- Lower bounds from LTS-9.21 (GHC 8.0.2)
114117
Build-Depends: HUnit >= 1.5.0.0
115118
, QuickCheck >= 2.9.2 && < 2.16
116119
, base >= 4.9 && < 5
117120
, random >= 1.1
118-
, containers >= 0.1
119-
, ansi-terminal >= 0.4.0
121+
, containers >= 0.5.7
122+
, ansi-terminal >= 0.6.3
120123
, ansi-wl-pprint >= 0.6.7
121-
, regex-posix >= 0.72
124+
, regex-posix >= 0.95.2
122125
, old-locale >= 1.0
123126
, time >= 1.6
124-
, xml >= 1.3.5
127+
, xml >= 1.3.14
125128
, hostname >= 1.0
126129
, libxml >= 0.1.1
127-
, bytestring >= 0.9
130+
, bytestring >= 0.10.8
128131
, semigroups >= 0.18
129132
, utf8-string >= 1.0.1.1 && <1.1
130133

0 commit comments

Comments
 (0)