@@ -80,7 +80,7 @@ before_install:
8080# We want to always allow newer versions of packages when building on GHC HEAD
8181- CABALARGS=""
8282- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
83−- export PATH=$PATH:/opt/happy/1.19.5/bin/:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin
83+- export PATH=$PATH:/opt/happy/1.19.5/bin/:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:$HOME/.cabal/bin
8484# Download and unpack the stack executable
8585- |
8686 if [[ $BUILD == "stack" ]]; then
@@ -100,14 +100,14 @@ install:
100100 case "$BUILD" in
101101 stack)
102102 ulimit -n 4096
103− stack --no-terminal --install-ghc $ARGS test --flag 'aeson:fast' --only-dependencies --fast --flag pandoc:embed_data_files --flag pandoc:trypandoc --test
104− stack install hsb2hs
103+ stack --no-terminal install hsb2hs
104+ stack --no-terminal --install-ghc $ARGS test --flag 'aeson:fast' --only-dependencies --fast --flag pandoc:embed_data_files --test
105105 ;;
106106 cabal)
107107 cabal --version
108108 travis_retry cabal update
109109 cabal install hsb2hs
110− cabal install -j --only-dependencies -ffast --enable-tests --enable-benchmarks -fembed_data_files -ftrypandoc --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS
110+ cabal install -j --only-dependencies -ffast --enable-tests --enable-benchmarks -fembed_data_files --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS
111111 ;;
112112 esac
113113
@@ -116,12 +116,12 @@ script:
116116 case "$BUILD" in
117117 stack)
118118 ulimit -n 4096
119− 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"
119+ stack --no-terminal $ARGS test --flag 'aeson:fast' --flag pandoc:embed_data_files --haddock --no-haddock-deps --ghc-options="-O0 -Wall -fno-warn-unused-do-bind -Werror"
120120 ;;
121121 cabal)
122122 cabal sdist --output-directory=sourcedist && \
123123 cd sourcedist && \
124− cabal configure --enable-tests --enable-benchmarks -ftrypandoc -v2 -fembed_data_files -ffast --ghc-options="-O0 -Wall -fno-warn-unused-do-bind -Werror" && \
124+ cabal configure --enable-tests --enable-benchmarks -v2 -fembed_data_files -ffast --ghc-options="-O0 -Wall -fno-warn-unused-do-bind -Werror" && \
125125 cabal build && \
126126 cabal test
127127 ;;