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.

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

Jump to bottom

v1.3.2.2-r2: allow containers-0.7 #58

Merged
merged 1 commit into from
Sep 28, 2023
Merged

v1.3.2.2-r2: allow containers-0.7 #58

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
59 changes: 26 additions & 33 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
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.20230824
# version: 0.17.20230928
#
# REGENDATA ("0.17.20230824",["github","regex-tdfa.cabal"])
# REGENDATA ("0.17.20230928",["github","regex-tdfa.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -27,24 +27,24 @@ 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.20230919
compilerKind: ghc
compilerVersion: 9.8.0.20230822
compilerVersion: 9.8.0.20230919
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.5
- compiler: ghc-9.4.7
compilerKind: ghc
compilerVersion: 9.4.5
compilerVersion: 9.4.7
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.8
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: bytestring
allow-newer: containers
allow-newer: text
EOF
if $HEADHACKAGE; then
Expand Down Expand Up @@ -298,20 +284,27 @@ jobs:
- name: prepare for constraint sets
run: |
rm -f cabal.project.local
- name: constraint set bytestring-0.12
run: |
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all --dry-run ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' 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
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='text ^>= 2.1' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi
- name: constraint set containers-0.7
run: |
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
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
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
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi
- name: constraint set bytestring-0.12
run: |
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all --dry-run ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi
- name: save cache
uses: actions/cache/save@v3
if: always()
Expand Down
27 changes: 18 additions & 9 deletions cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ branches: master

installed: +all

constraint-set text-2.1
-- text-2.1 requires base >=4.10 (GHC 8.2)
ghc: >= 8.2
constraints: text ^>= 2.1
tests: True
run-tests: True

constraint-set bytestring-0.12
-- bytestring-0.12 requires base >=4.9 (GHC 8.0)
ghc: >= 8.0
Expand All @@ -22,8 +15,23 @@ constraint-set bytestring-0.12
-- allow-newer: bytestring
--

-- The following is meant to be for constraint-set bytestring-0.12 only
-- (and for constraint-set text-2.1)
constraint-set containers-0.7
-- containers-0.7 requires base >=4.9 (GHC 8.0)
-- fails with GHCs 8.0 and 9.8.0
ghc: >= 8.2 && < 9.7
constraints: containers ^>= 0.7
tests: True
run-tests: True

constraint-set text-2.1
-- text-2.1 requires base >=4.10 (GHC 8.2)
ghc: >= 8.2
constraints: text ^>= 2.1
tests: True
run-tests: True

-- The following is meant to be for the constraint-set bytestring-0.12 only
-- (and for the other constraint-sets)
-- but there is currently no way to enable `allow-newer: bytestring`
-- just for the constraint set.
--
Expand All @@ -33,4 +41,5 @@ constraint-set bytestring-0.12
--
raw-project
allow-newer: bytestring
allow-newer: containers
allow-newer: text
13 changes: 5 additions & 8 deletions regex-tdfa.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 1.12
name: regex-tdfa
version: 1.3.2.2
x-revision: 1
x-revision: 2

build-Type: Simple
license: BSD3
Expand All @@ -27,8 +27,8 @@ extra-source-files:

tested-with:
GHC == 9.8.0
GHC == 9.6.2
GHC == 9.4.5
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.2.8
GHC == 9.0.2
GHC == 8.10.7
Expand All @@ -38,9 +38,6 @@ 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

source-repository head
type: git
Expand All @@ -49,7 +46,7 @@ source-repository head
source-repository this
type: git
location: https://github.com/haskell-hvr/regex-tdfa.git
tag: v1.3.2.2-r1
tag: v1.3.2.2-r2

flag force-O2
default: False
Expand Down Expand Up @@ -109,7 +106,7 @@ library
build-depends: array >= 0.4 && < 0.6
, base >= 4.5 && < 5
, bytestring >= 0.9.2 && < 0.13
, containers >= 0.4.2 && < 0.7
, containers >= 0.4.2 && < 0.8
, mtl >= 2.1.3 && < 2.4
, parsec == 3.1.*
, regex-base == 0.94.*
Expand Down