From 585c345c356f8e8dd2db564503a8c1f8d8c31fbb Mon Sep 17 00:00:00 2001 From: Lennart Spitzner Date: Sun, 15 Oct 2017 00:32:10 +0200 Subject: [PATCH] Fix silently broken travis setup (rahhh) --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b62149..da510f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,7 +180,7 @@ before_install: - | function better_wait() { date - time "$*" & # send the long living command to background! + time "$@" & # send the long living command to background! set +x MINUTES=0 @@ -231,7 +231,7 @@ install: echo "cabal build-cache MISS"; rm -rf $HOME/.cabsnap; mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin; - cabal install -j$JOBS --only-dependencies --enable-tests --enable-benchmarks --ghc-options="-j1 +RTS -M500M"; + cabal install -j$JOBS --only-dependencies --enable-tests --enable-benchmarks --ghc-options="-j1 +RTS -M500M -RTS"; fi # snapshot package-db on cache miss @@ -259,12 +259,12 @@ script: set -ex case "$BUILD" in stack) - better_wait stack --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps --ghc-options="-j1 +RTS -M500M" + better_wait stack --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps --ghc-options="-j1 +RTS -M500M -RTS" ;; cabal) if [ -f configure.ac ]; then autoreconf -i; fi cabal configure --enable-tests --enable-benchmarks -v # -v2 provides useful information for debugging - better_wait cabal build -j$JOBS --ghc-options="-j1 +RTS -M500M" # this builds all libraries and executables (including tests/benchmarks) + better_wait cabal build -j$JOBS --ghc-options="-j1 +RTS -M500M -RTS" # this builds all libraries and executables (including tests/benchmarks) cabal test ;; cabaldist) @@ -275,12 +275,12 @@ script: # If there are no other `.tar.gz` files in `dist`, this can be even simpler: # `cabal install --force-reinstalls dist/*-*.tar.gz` SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && - (cd dist && better_wait cabal install -j$JOBS --force-reinstalls "$SRC_TGZ" --ghc-options="-j1 +RTS -M500M") + (cd dist && better_wait cabal install -j$JOBS --force-reinstalls "$SRC_TGZ" --ghc-options="-j1 +RTS -M500M -RTS") ;; canew) better_wait cabal new-build -j$JOBS --disable-tests --disable-benchmarks better_wait cabal new-build -j$JOBS --enable-tests --enable-benchmarks - cabal new-test --ghc-options="-j1 +RTS -M500M" + cabal new-test --ghc-options="-j1 +RTS -M500M -RTS" ;; esac set +ex