git.iko.soy/typeable/pandoc
on master help sign in
More travis fixes.
a85d784John MacFarlane
.travis.yml+6−6
compare with master
unifiedsplit
@@ -80,7 +80,7 @@ before_install:
80# We want to always allow newer versions of packages when building on GHC HEAD
80# We want to always allow newer versions of packages when building on GHC HEAD
81- CABALARGS=""
81- CABALARGS=""
82- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
82- 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
84# Download and unpack the stack executable
84# Download and unpack the stack executable
85- |
85- |
86 if [[ $BUILD == "stack" ]]; then
86 if [[ $BUILD == "stack" ]]; then
@@ -100,14 +100,14 @@ install:
100 case "$BUILD" in
100 case "$BUILD" in
101 stack)
101 stack)
102 ulimit -n 4096
102 ulimit -n 4096
103+ stack --no-terminal install hsb2hs
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 --no-terminal --install-ghc $ARGS test --flag 'aeson:fast' --only-dependencies --fast --flag pandoc:embed_data_files --test
104− stack install hsb2hs
105 ;;
105 ;;
106 cabal)
106 cabal)
107 cabal --version
107 cabal --version
108 travis_retry cabal update
108 travis_retry cabal update
109 cabal install hsb2hs
109 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
111 ;;
111 ;;
112 esac
112 esac
113
113
@@ -116,12 +116,12 @@ script:
116 case "$BUILD" in
116 case "$BUILD" in
117 stack)
117 stack)
118 ulimit -n 4096
118 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"
120 ;;
120 ;;
121 cabal)
121 cabal)
122 cabal sdist --output-directory=sourcedist && \
122 cabal sdist --output-directory=sourcedist && \
123 cd sourcedist && \
123 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" && \
125 cabal build && \
125 cabal build && \
126 cabal test
126 cabal test
127 ;;
127 ;;