summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-03-20 15:55:42 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2017-03-20 15:55:42 +0100
commit757edd052532f3912419f036af18cac6e056c7e0 (patch)
tree4125230157197edd1b6558c0fe7e091242374176
parent5a1c9109e0ec08acb65de234ad04cbc9cf61ea11 (diff)
More travis fixes.
-rw-r--r--.travis.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index eb0200c4c..8bfa390bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,7 +105,7 @@ install:
cabal)
cabal --version
travis_retry cabal update
- cabal install -j --only-dependencies -ffast --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS
+ cabal install -j --only-dependencies -ffast --enable-tests --enable-benchmarks --flag pandoc:embed_data_files --flag pandoc:trypandoc --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS
;;
esac
@@ -114,10 +114,9 @@ script:
case "$BUILD" in
stack)
ulimit -n 4096
- stack --no-terminal $ARGS test --flag 'aeson:fast' --haddock --no-haddock-deps --ghc-options="-O0 -Wall -fno-warn-unused-do-bind -Werror"
+ stack --no-terminal $ARGS test --flag 'aeson:fast' --flag pandoc:embed_data_files --flag pandoc:trypandoc --haddock --no-haddock-deps --ghc-options="-O0 -Wall -fno-warn-unused-do-bind -Werror"
;;
cabal)
- cabal configure && \
cabal sdist --output-directory=sourcedist && \
cd sourcedist && \
cabal configure --enable-tests --enable-benchmarks -ftrypandoc -v2 -fembed_data_files -ffast --ghc-options="-O0 -Wall -fno-warn-unused-do-bind -Werror" && \