Skip to content

Commit de136f2

Browse files
andreasabelandreasabel
committed
v1.3.2.2-r2: allow containers-0.7
1 parent 1059644 commit de136f2

File tree

3 files changed

+49
-50
lines changed

3 files changed

+49
-50
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/haskell-CI/haskell-ci
9+
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20230824
11+
# version: 0.17.20230928
1212
#
13-
# REGENDATA ("0.17.20230824",["github","regex-tdfa.cabal"])
13+
# REGENDATA ("0.17.20230928",["github","regex-tdfa.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -27,24 +27,24 @@ jobs:
2727
timeout-minutes:
2828
60
2929
container:
30-
image: buildpack-deps:bionic
30+
image: buildpack-deps:focal
3131
continue-on-error: ${{ matrix.allow-failure }}
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.0.20230822
35+
- compiler: ghc-9.8.0.20230919
3636
compilerKind: ghc
37-
compilerVersion: 9.8.0.20230822
37+
compilerVersion: 9.8.0.20230919
3838
setup-method: ghcup
3939
allow-failure: true
40-
- compiler: ghc-9.6.2
40+
- compiler: ghc-9.6.3
4141
compilerKind: ghc
42-
compilerVersion: 9.6.2
42+
compilerVersion: 9.6.3
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.4.5
45+
- compiler: ghc-9.4.7
4646
compilerKind: ghc
47-
compilerVersion: 9.4.5
47+
compilerVersion: 9.4.7
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.2.8
@@ -92,21 +92,6 @@ jobs:
9292
compilerVersion: 7.10.3
9393
setup-method: hvr-ppa
9494
allow-failure: false
95-
- compiler: ghc-7.8.4
96-
compilerKind: ghc
97-
compilerVersion: 7.8.4
98-
setup-method: hvr-ppa
99-
allow-failure: false
100-
- compiler: ghc-7.6.3
101-
compilerKind: ghc
102-
compilerVersion: 7.6.3
103-
setup-method: hvr-ppa
104-
allow-failure: false
105-
- compiler: ghc-7.4.2
106-
compilerKind: ghc
107-
compilerVersion: 7.4.2
108-
setup-method: hvr-ppa
109-
allow-failure: false
11095
fail-fast: false
11196
steps:
11297
- name: apt
@@ -225,7 +210,7 @@ jobs:
225210
chmod a+x $HOME/.cabal/bin/cabal-plan
226211
cabal-plan --version
227212
- name: checkout
228-
uses: actions/checkout@v3
213+
uses: actions/checkout@v4
229214
with:
230215
path: source
231216
- name: initial cabal.project for sdist
@@ -253,6 +238,7 @@ jobs:
253238
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
254239
cat >> cabal.project <<EOF
255240
allow-newer: bytestring
241+
allow-newer: containers
256242
allow-newer: text
257243
EOF
258244
if $HEADHACKAGE; then
@@ -298,20 +284,27 @@ jobs:
298284
- name: prepare for constraint sets
299285
run: |
300286
rm -f cabal.project.local
301-
- name: constraint set bytestring-0.12
302-
run: |
303-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all --dry-run ; fi
304-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
305-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' --dependencies-only -j2 all ; fi
306-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi
307-
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi
308287
- name: constraint set text-2.1
309288
run: |
310289
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all --dry-run ; fi
311290
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
312291
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' --dependencies-only -j2 all ; fi
313292
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi
314293
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>= 2.1' all ; fi
294+
- name: constraint set containers-0.7
295+
run: |
296+
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
297+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
298+
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
299+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi
300+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>= 0.7' all ; fi
301+
- name: constraint set bytestring-0.12
302+
run: |
303+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all --dry-run ; fi
304+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
305+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' --dependencies-only -j2 all ; fi
306+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi
307+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring ^>= 0.12' all ; fi
315308
- name: save cache
316309
uses: actions/cache/save@v3
317310
if: always()

‎cabal.haskell-ci‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ branches: master
22

33
installed: +all
44

5-
constraint-set text-2.1
6-
-- text-2.1 requires base >=4.10 (GHC 8.2)
7-
ghc: >= 8.2
8-
constraints: text ^>= 2.1
9-
tests: True
10-
run-tests: True
11-
125
constraint-set bytestring-0.12
136
-- bytestring-0.12 requires base >=4.9 (GHC 8.0)
147
ghc: >= 8.0
@@ -22,8 +15,23 @@ constraint-set bytestring-0.12
2215
-- allow-newer: bytestring
2316
--
2417

25-
-- The following is meant to be for constraint-set bytestring-0.12 only
26-
-- (and for constraint-set text-2.1)
18+
constraint-set containers-0.7
19+
-- containers-0.7 requires base >=4.9 (GHC 8.0)
20+
-- fails with GHCs 8.0 and 9.8.0
21+
ghc: >= 8.2 && < 9.7
22+
constraints: containers ^>= 0.7
23+
tests: True
24+
run-tests: True
25+
26+
constraint-set text-2.1
27+
-- text-2.1 requires base >=4.10 (GHC 8.2)
28+
ghc: >= 8.2
29+
constraints: text ^>= 2.1
30+
tests: True
31+
run-tests: True
32+
33+
-- The following is meant to be for the constraint-set bytestring-0.12 only
34+
-- (and for the other constraint-sets)
2735
-- but there is currently no way to enable `allow-newer: bytestring`
2836
-- just for the constraint set.
2937
--
@@ -33,4 +41,5 @@ constraint-set bytestring-0.12
3341
--
3442
raw-project
3543
allow-newer: bytestring
44+
allow-newer: containers
3645
allow-newer: text

‎regex-tdfa.cabal‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 1.12
22
name: regex-tdfa
33
version: 1.3.2.2
4-
x-revision: 1
4+
x-revision: 2
55

66
build-Type: Simple
77
license: BSD3
@@ -27,8 +27,8 @@ extra-source-files:
2727

2828
tested-with:
2929
GHC == 9.8.0
30-
GHC == 9.6.2
31-
GHC == 9.4.5
30+
GHC == 9.6.3
31+
GHC == 9.4.7
3232
GHC == 9.2.8
3333
GHC == 9.0.2
3434
GHC == 8.10.7
@@ -38,9 +38,6 @@ tested-with:
3838
GHC == 8.2.2
3939
GHC == 8.0.2
4040
GHC == 7.10.3
41-
GHC == 7.8.4
42-
GHC == 7.6.3
43-
GHC == 7.4.2
4441

4542
source-repository head
4643
type: git
@@ -49,7 +46,7 @@ source-repository head
4946
source-repository this
5047
type: git
5148
location: https://github.com/haskell-hvr/regex-tdfa.git
52-
tag: v1.3.2.2-r1
49+
tag: v1.3.2.2-r2
5350

5451
flag force-O2
5552
default: False
@@ -109,7 +106,7 @@ library
109106
build-depends: array >= 0.4 && < 0.6
110107
, base >= 4.5 && < 5
111108
, bytestring >= 0.9.2 && < 0.13
112-
, containers >= 0.4.2 && < 0.7
109+
, containers >= 0.4.2 && < 0.8
113110
, mtl >= 2.1.3 && < 2.4
114111
, parsec == 3.1.*
115112
, regex-base == 0.94.*

0 commit comments

Comments
 (0)