Skip to content
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.

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

v0.5.3.0-r4: cassava 0.5.3.0 revision 4: allow containers-0.7 #225

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 17 additions & 24 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#
# haskell-ci regenerate
#
# For more information, see https://github.com/haskell-CI/haskell-ci
# For more information, see https://github.com/andreasabel/haskell-ci
#
# version: 0.17.20230827
# version: 0.17.20231002
#
# REGENDATA ("0.17.20230827",["github","cassava.cabal"])
# REGENDATA ("0.17.20231002",["github","cassava.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -27,19 +27,19 @@ jobs:
timeout-minutes:
60
container:
image: buildpack-deps:bionic
image: buildpack-deps:focal
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.8.0.20230822
- compiler: ghc-9.8.0.20230929
compilerKind: ghc
compilerVersion: 9.8.0.20230822
compilerVersion: 9.8.0.20230929
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.6.2
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.6.2
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.7
Expand Down Expand Up @@ -92,21 +92,6 @@ jobs:
compilerVersion: 7.10.3
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.8.4
compilerKind: ghc
compilerVersion: 7.8.4
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.6.3
compilerKind: ghc
compilerVersion: 7.6.3
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.4.2
compilerKind: ghc
compilerVersion: 7.4.2
setup-method: hvr-ppa
allow-failure: false
fail-fast: false
steps:
- name: apt
Expand Down Expand Up @@ -225,7 +210,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: source
- name: initial cabal.project for sdist
Expand Down Expand Up @@ -253,6 +238,7 @@ jobs:
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
allow-newer: text
allow-newer: containers
EOF
if $HEADHACKAGE; then
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
Expand Down Expand Up @@ -297,6 +283,13 @@ jobs:
- name: prepare for constraint sets
run: |
rm -f cabal.project.local
- name: constraint set containers-0.7
run: |
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.7' 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.7' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.7' all ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.7' all ; fi
- name: constraint set text-2.1
run: |
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.1' all --dry-run ; fi
Expand Down
11 changes: 10 additions & 1 deletion cabal.haskell-ci
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,13 @@ constraint-set text-2.1
run-tests: True

raw-project
allow-newer: text
allow-newer: text

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

raw-project
allow-newer: containers
10 changes: 5 additions & 5 deletions cassava.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Extra-source-files: examples/*.hs,
README.md
Tested-with:
GHC == 9.8.0
GHC == 9.6.2
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.2.8
GHC == 9.0.2
Expand All @@ -56,9 +56,9 @@ Tested-with:
GHC == 8.2.2
GHC == 8.0.2
GHC == 7.10.3
GHC == 7.8.4
GHC == 7.6.3
GHC == 7.4.2
-- GHC == 7.8.4
-- GHC == 7.6.3
-- GHC == 7.4.2

----------------------------------------------------------------------------

Expand Down Expand Up @@ -116,7 +116,7 @@ Library
, array >= 0.4 && < 0.6
, attoparsec >= 0.11.3.0 && < 0.15
, bytestring >= 0.9.2 && < 0.13
, containers >= 0.4.2 && < 0.7
, containers >= 0.4.2 && < 0.8
, deepseq >= 1.1 && < 1.6
, hashable < 1.5
, scientific >= 0.3.4.7 && < 0.4
Expand Down
Loading