Skip to content

Commit 6a97398

Browse files
committed
CI: limit tests to GHC >= 8.2 because of doctest-parallel
1 parent 20ac174 commit 6a97398

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
147147
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
148148
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
149-
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
149+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
150150
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
151151
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
152152
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
@@ -243,7 +243,7 @@ jobs:
243243
if $HEADHACKAGE; then
244244
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
245245
fi
246-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(regex-tdfa|text)$/; }' >> cabal.project.local
246+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|regex-tdfa|text)$/; }' >> cabal.project.local
247247
cat cabal.project
248248
cat cabal.project.local
249249
- name: dump install plan
@@ -268,7 +268,7 @@ jobs:
268268
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
269269
- name: tests
270270
run: |
271-
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
271+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
272272
- name: cabal check
273273
run: |
274274
cd ${PKGDIR_regex_tdfa} || false

cabal.haskell-ci

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
branches: master
22

3-
installed: +all -text
3+
installed: +all -text -Cabal
44

55
constraint-set mtl-2.3
66
ghc: >= 8.6
7-
constraints: mtl >= 2.3, transformers >= 0.6
7+
constraints: mtl >= 2.3, transformers >= 0.6
8+
9+
-- doctest-parallel requires base >= 4.10
10+
tests: >= 8.2

0 commit comments

Comments
 (0)