a908528 · typeable/servant

git.iko.soy/typeable/servant

on master help sign in

travis fixes

a908528Julian K. Arni11 years ago

scripts/lib/common.sh+1

@@ -15,6 +15,7 @@ DRY_RUN=false

15POSITION="none"

16SOURCES_TXT="$( dirname $DIR)/sources.txt"

17CABAL=${CABAL:-cabal}

18+TRAVIS=${TRAVIS:-false}

19declare -a SOURCES

20declare -a SOURCES

20readarray -t SOURCES < "$SOURCES_TXT"

21readarray -t SOURCES < "$SOURCES_TXT"

scripts/test-all.sh+2−2

@@ -25,9 +25,9 @@ prepare_sandbox () {

25 (cd "$s" && $CABAL sandbox init --sandbox=../.cabal-sandbox/ && $CABAL sandbox add-source .)

26 done

27 if $TRAVIS ; then

28− travis_retry $CABAL install --enable-tests ${SOURCES[@]}

28+ travis_retry $CABAL install -v --enable-tests ${SOURCES[@]}

29 else

30− $CABAL install -vvv --enable-tests ${SOURCES[@]}

30+ $CABAL install --enable-tests ${SOURCES[@]}

31 fi

32}