Skip to content

Commit 28552ee

Browse files
committed
Travis: Work around old GHC issues
1 parent f39bf4e commit 28552ee

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ install:
125125
- ${CABAL} --version
126126
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
127127
- TEST=--enable-tests
128+
- if [ $HCNUMVER -ge 70200 ] && [ $HCNUMVER -lt 70202 ] ; then TEST=--disable-tests ; fi
128129
- BENCH=--enable-benchmarks
129130
- HEADHACKAGE=false
130131
- rm -f $CABALHOME/config
@@ -156,7 +157,7 @@ install:
156157
- |
157158
echo "package testsuite" >> cabal.project
158159
echo " tests: true" >> cabal.project
159-
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(stm|testsuite)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
160+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(random|stm|testsuite)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
160161
- cat cabal.project || true
161162
- cat cabal.project.local || true
162163
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
@@ -186,7 +187,7 @@ script:
186187
- |
187188
echo "package testsuite" >> cabal.project
188189
echo " tests: true" >> cabal.project
189-
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(stm|testsuite)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
190+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(random|stm|testsuite)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
190191
- cat cabal.project || true
191192
- cat cabal.project.local || true
192193
# Building...
@@ -196,7 +197,7 @@ script:
196197
# build & run tests, build benchmarks
197198
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
198199
# Testing...
199-
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
200+
- if [ $HCNUMVER -lt 70200 ] || [ $HCNUMVER -ge 70202 ] ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
200201
# cabal check...
201202
- (cd ${PKGDIR_stm} && ${CABAL} -vnormal check)
202203
- (cd ${PKGDIR_testsuite} && ${CABAL} -vnormal check)

cabal.haskell-ci

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
copy-fields: all
2+
tests: <7.2.1 || >=7.2.2
3+
installed: +all -random

0 commit comments

Comments
 (0)