Try fixing CI, ghc-8.8 seems to use more heap

remotes/felixonmars/release
Lennart Spitzner 2019-09-29 22:21:01 +02:00
parent 89b7655bac
commit 17055479d3
1 changed files with 10 additions and 10 deletions

View File

@ -200,7 +200,7 @@ install:
echo "cabal build-cache MISS"; echo "cabal build-cache MISS";
rm -rf $HOME/.cabsnap; rm -rf $HOME/.cabsnap;
mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin; 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 -RTS"; cabal install -j$JOBS --only-dependencies --enable-tests --enable-benchmarks --ghc-options="-j1 +RTS -M700M -RTS";
fi fi
# snapshot package-db on cache miss # snapshot package-db on cache miss
@ -217,7 +217,7 @@ install:
travis_retry cabal update -v travis_retry cabal update -v
echo 'packages: .' > cabal.project echo 'packages: .' > cabal.project
echo 'package brittany' > cabal.project.local echo 'package brittany' > cabal.project.local
echo ' ghc-options: -Werror -with-rtsopts=-N1' >> cabal.project.local echo ' ghc-options: -Werror -with-rtsopts=-N1 -j1 +RTS -M700M -RTS' >> cabal.project.local
echo ' flags: +brittany-test-perf' >> cabal.project.local echo ' flags: +brittany-test-perf' >> cabal.project.local
rm -f cabal.project.freeze rm -f cabal.project.freeze
cabal new-build -j$JOBS --enable-test --enable-benchmarks --dep cabal new-build -j$JOBS --enable-test --enable-benchmarks --dep
@ -231,12 +231,12 @@ script:
set -ex set -ex
case "$BUILD" in case "$BUILD" in
stack) stack)
better_wait stack -j$JOBS --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps --ghc-options="-j1 +RTS -M500M -RTS -Werror -with-rtsopts=-N1" --flag brittany:brittany-test-perf better_wait stack -j$JOBS --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps --ghc-options="-j1 +RTS -M700M -RTS -Werror -with-rtsopts=-N1" --flag brittany:brittany-test-perf
;; ;;
cabal) cabal)
if [ -f configure.ac ]; then autoreconf -i; fi if [ -f configure.ac ]; then autoreconf -i; fi
cabal configure --enable-tests --enable-benchmarks -v --flags="brittany-test-perf" # -v2 provides useful information for debugging cabal configure --enable-tests --enable-benchmarks -v --flags="brittany-test-perf" # -v2 provides useful information for debugging
better_wait cabal build -j$JOBS --ghc-options="-j1 +RTS -M500M -RTS -Werror" # this builds all libraries and executables (including tests/benchmarks) better_wait cabal build -j$JOBS --ghc-options="-j1 +RTS -M700M -RTS -Werror" # this builds all libraries and executables (including tests/benchmarks)
time cabal test --ghc-options="-with-rtsopts=-N1" time cabal test --ghc-options="-with-rtsopts=-N1"
;; ;;
cabaldist) cabaldist)
@ -247,12 +247,12 @@ script:
# If there are no other `.tar.gz` files in `dist`, this can be even simpler: # If there are no other `.tar.gz` files in `dist`, this can be even simpler:
# `cabal install --force-reinstalls dist/*-*.tar.gz` # `cabal install --force-reinstalls dist/*-*.tar.gz`
SRC_TGZ=$(cabal info . | awk '{print $2;exit}').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 -RTS") (cd dist && better_wait cabal install -j$JOBS --force-reinstalls "$SRC_TGZ" --ghc-options="-j1 +RTS -M700M -RTS")
;; ;;
canew) canew)
better_wait cabal new-build -j$JOBS --ghc-options="-j1 +RTS -M500M -RTS" --disable-tests --disable-benchmarks better_wait cabal new-build -j$JOBS --disable-tests --disable-benchmarks
better_wait cabal new-build -j$JOBS --ghc-options="-j1 +RTS -M500M -RTS" --enable-tests --enable-benchmarks better_wait cabal new-build -j$JOBS --enable-tests --enable-benchmarks
time cabal new-test -j1 --ghc-options="-j1 +RTS -M500M -RTS" time cabal new-test -j1
;; ;;
esac esac
set +ex set +ex