Skip to content

Commit 930060b

Browse files
authored
Merge pull request #118 from haskellari/transformers-0.6
Allow transformers-0.6
2 parents 0d64ba4 + 609ef14 commit 930060b

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

.github/workflows/haskell-ci.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.13.20211111
11+
# version: 0.14.3
1212
#
13-
# REGENDATA ("0.13.20211111",["github","--config=cabal.haskell-ci","lattices.cabal"])
13+
# REGENDATA ("0.14.3",["github","--config=cabal.haskell-ci","lattices.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -95,7 +95,7 @@ jobs:
9595
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
9696
if [ "${{ matrix.setup-method }}" = ghcup ]; then
9797
mkdir -p "$HOME/.ghcup/bin"
98-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
98+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
9999
chmod a+x "$HOME/.ghcup/bin/ghcup"
100100
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
101101
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
@@ -104,7 +104,7 @@ jobs:
104104
apt-get update
105105
apt-get install -y "$HCNAME"
106106
mkdir -p "$HOME/.ghcup/bin"
107-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
107+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
108108
chmod a+x "$HOME/.ghcup/bin/ghcup"
109109
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
110110
fi
@@ -182,7 +182,7 @@ jobs:
182182
- name: cache (tools)
183183
uses: actions/cache@v2
184184
with:
185-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a12dda74
185+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-5487a2e0
186186
path: ~/.haskell-ci-tools
187187
- name: install cabal-plan
188188
run: |
@@ -196,15 +196,15 @@ jobs:
196196
- name: install cabal-docspec
197197
run: |
198198
mkdir -p $HOME/.cabal/bin
199-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20210111/cabal-docspec-0.0.0.20210111.xz > cabal-docspec.xz
200-
echo '0829bd034fba901cbcfe491d98ed8b28fd54f9cb5c91fa8e1ac62dc4413c9562 cabal-docspec.xz' | sha256sum -c -
199+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20211114/cabal-docspec-0.0.0.20211114.xz > cabal-docspec.xz
200+
echo 'e224700d9e8c9ec7ec6bc3f542ba433cd9925a5d356676c62a9bd1f2c8be8f8a cabal-docspec.xz' | sha256sum -c -
201201
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
202202
rm -f cabal-docspec.xz
203203
chmod a+x $HOME/.cabal/bin/cabal-docspec
204204
cabal-docspec --version
205205
- name: install doctest
206206
run: |
207-
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi
207+
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
208208
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
209209
- name: checkout
210210
uses: actions/checkout@v2
@@ -264,7 +264,7 @@ jobs:
264264
- name: doctest
265265
run: |
266266
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_lattices} || false ; fi
267-
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
267+
if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
268268
- name: docspec
269269
run: |
270270
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all
@@ -280,3 +280,10 @@ jobs:
280280
run: |
281281
rm -f cabal.project.local
282282
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
283+
- name: prepare for constraint sets
284+
run: |
285+
rm -f cabal.project.local
286+
- name: constraint set transformers-0.6
287+
run: |
288+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='transformers ^>=0.6' --dependencies-only -j2 all
289+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='transformers ^>=0.6' all

cabal.haskell-ci

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
branches: master
22
doctest: <9.0
33
docspec: True
4+
5+
constraint-set transformers-0.6
6+
constraints: transformers ^>=0.6

lattices.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 1.18
22
name: lattices
33
version: 2.0.3
4-
x-revision: 2
4+
x-revision: 3
55
category: Math
66
license: BSD3
77
license-file: LICENSE
@@ -92,7 +92,7 @@ library
9292
, QuickCheck >=2.12.6.1 && <2.15
9393
, semigroupoids >=5.3.2 && <5.4
9494
, tagged >=0.8.6 && <0.9
95-
, transformers >=0.3.0.0 && <0.6
95+
, transformers >=0.3.0.0 && <0.7
9696
, universe-base >=1.1 && <1.2
9797
, universe-reverse-instances >=1.1 && <1.2
9898
, unordered-containers >=0.2.8.0 && <0.3

0 commit comments

Comments
 (0)