Commit b7438cab authored by Stefan Behnel's avatar Stefan Behnel

Make travis install script fail on intermediate errors.

parent 694cb93b
...@@ -108,7 +108,7 @@ branches: ...@@ -108,7 +108,7 @@ branches:
before_install: before_install:
- | - |
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [ "$TRAVIS_OS_NAME" == "linux" ]; then
# adding apt repos in travis is really fragile => retry a couple of times. # adding apt repos in travis is really fragile => retry a couple of times.
for i in {1..10}; do travis_retry sudo apt-add-repository --yes 'ppa:ubuntu-toolchain-r/test' && break; sleep 2; done for i in {1..10}; do travis_retry sudo apt-add-repository --yes 'ppa:ubuntu-toolchain-r/test' && break; sleep 2; done
for i in {1..10}; do travis_retry sudo apt-get update && travis_retry sudo apt-get install --yes gcc-8 $(if [ -z "${BACKEND##*cpp*}" ]; then echo -n "g++-8"; fi ) && break; sleep 2; done for i in {1..10}; do travis_retry sudo apt-get update && travis_retry sudo apt-get install --yes gcc-8 $(if [ -z "${BACKEND##*cpp*}" ]; then echo -n "g++-8"; fi ) && break; sleep 2; done
...@@ -122,11 +122,11 @@ before_install: ...@@ -122,11 +122,11 @@ before_install:
if [ "$TRAVIS_OS_NAME" == "osx" -o "$STACKLESS" == "true" ]; then if [ "$TRAVIS_OS_NAME" == "osx" -o "$STACKLESS" == "true" ]; then
echo "Installing Miniconda" echo "Installing Miniconda"
if [ "$TRAVIS_OS_NAME" == "osx" ]; then CONDA_PLATFORM=MacOSX; else CONDA_PLATFORM=Linux; fi if [ "$TRAVIS_OS_NAME" == "osx" ]; then CONDA_PLATFORM=MacOSX; else CONDA_PLATFORM=Linux; fi
travis_retry wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-${CONDA_PLATFORM}-x86_64.sh travis_retry wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-${CONDA_PLATFORM}-x86_64.sh || exit 1
bash miniconda.sh -b -p $HOME/miniconda && rm miniconda.sh bash miniconda.sh -b -p $HOME/miniconda && rm miniconda.sh || exit 1
conda --version conda --version || exit 1
#conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt #conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
which clang && clang --version && export CC=clang || true which clang && clang --version && export CC=clang || true
which clang++ && clang++ --version && export CXX=clang++ || true which clang++ && clang++ --version && export CXX=clang++ || true
fi fi
...@@ -135,7 +135,7 @@ before_install: ...@@ -135,7 +135,7 @@ before_install:
- if [ -n "$CC" ]; then which $CC; $CC --version; fi - if [ -n "$CC" ]; then which $CC; $CC --version; fi
- if [ -n "$CXX" ]; then which $CXX; $CXX --version; fi - if [ -n "$CXX" ]; then which $CXX; $CXX --version; fi
- if [[ "$STACKLESS" == "true" ]]; then - if [ "$STACKLESS" == "true" ]; then
conda config --add channels stackless; conda config --add channels stackless;
travis_retry conda install --quiet --yes stackless; travis_retry conda install --quiet --yes stackless;
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment