Skip to content

v0.8.2.1-r1: allow newer containers, drop dependencies before LTS 7.24 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreasabel merged 1 commit into from
Mar 15, 2025
Merged

v0.8.2.1-r1: allow newer containers, drop dependencies before LTS 7.24 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ jobs:
cat >> cabal.project <<EOF
package libxml
extra-include-dirs: /usr/include/libxml2

allow-newer: containers
EOF
$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
cat cabal.project
Expand Down Expand Up @@ -279,6 +281,16 @@ jobs:
run: |
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: prepare for constraint sets
run: |
rm -f cabal.project.local
- name: constraint set containers-0.8
run: |
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all --dry-run ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all ; fi
- name: save cache
if: always()
uses: actions/cache/save@v4
Expand Down
9 changes: 9 additions & 0 deletions cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@ raw-project
-- On Debian/Ubuntu you may need the following to workaround an issue in libxml's packaging
package libxml
extra-include-dirs: /usr/include/libxml2

constraint-set containers-0.8
ghc: >= 8.2
constraints: containers ^>=0.8
tests: True
run-tests: True

raw-project
allow-newer: containers
33 changes: 18 additions & 15 deletions core/test-framework.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Cabal-Version: 1.18
Name: test-framework
Version: 0.8.2.1
x-revision: 1
Category: Testing
Synopsis: Framework for running and organising tests, with HUnit and QuickCheck support
Description: Allows tests such as QuickCheck properties and HUnit test cases to be assembled into test groups, run in
Expand Down Expand Up @@ -59,16 +60,17 @@ Library
Test.Framework.Runners.XML
Test.Framework.Utilities

Build-Depends: base >= 4.9 && < 5
, ansi-terminal >= 0.4.0 && < 1.2
, ansi-wl-pprint >= 0.6.7 && < 1.1
, random >= 1.1 && < 1.4
, containers >= 0.1 && < 0.8
, regex-posix >= 0.72 && < 0.97
, old-locale >= 1.0 && < 1.1
, time >= 1.6 && < 1.15
, xml >= 1.3.5 && < 1.4
, hostname >= 1.0 && < 1.1
-- Lower bounds picked from LTS-7.24 (GHC 8.0.1)
Build-Depends: base >= 4.9 && < 5
, ansi-terminal >= 0.6.3 && < 1.2
, ansi-wl-pprint >= 0.6.7 && < 1.1
, random >= 1.1 && < 1.4
, containers >= 0.5.7 && < 1
, regex-posix >= 0.95.2 && < 0.97
, old-locale >= 1.0 && < 1.1
, time >= 1.6 && < 1.15
, xml >= 1.3.14 && < 1.4
, hostname >= 1.0 && < 1.1

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

-- Lower bounds from LTS-9.21 (GHC 8.0.2)
Build-Depends: HUnit >= 1.5.0.0
, QuickCheck >= 2.9.2 && < 2.16
, base >= 4.9 && < 5
, random >= 1.1
, containers >= 0.1
, ansi-terminal >= 0.4.0
, containers >= 0.5.7
, ansi-terminal >= 0.6.3
, ansi-wl-pprint >= 0.6.7
, regex-posix >= 0.72
, regex-posix >= 0.95.2
, old-locale >= 1.0
, time >= 1.6
, xml >= 1.3.5
, xml >= 1.3.14
, hostname >= 1.0
, libxml >= 0.1.1
, bytestring >= 0.9
, bytestring >= 0.10.8
, semigroups >= 0.18
, utf8-string >= 1.0.1.1 && <1.1

Expand Down