From c8adf4531f997c2701bec5084b5d92e37b632969 Mon Sep 17 00:00:00 2001 From: Dominic Hamon Date: Tue, 29 May 2018 13:12:48 +0100 Subject: [PATCH] Add some 'travis_wait' commands to avoid gcc@7 installation timeouts. (#605) --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09c058c5..168ed0b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,31 +155,31 @@ before_install: install: - if [ -n "${INSTALL_GCC6_FROM_PPA}" ]; then - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install g++-6; + travis_wait sudo -E apt-get -yq --no-install-suggests --no-install-recommends install g++-6; fi - if [ "${TRAVIS_OS_NAME}" == "linux" -a "${BUILD_32_BITS}" == "OFF" ]; then - sudo -E apt-get -y --no-install-suggests --no-install-recommends install llvm-3.9-tools; + travis_wait sudo -E apt-get -y --no-install-suggests --no-install-recommends install llvm-3.9-tools; sudo cp /usr/lib/llvm-3.9/bin/FileCheck /usr/local/bin/; fi - if [ "${BUILD_TYPE}" == "Coverage" -a "${TRAVIS_OS_NAME}" == "linux" ]; then PATH=~/.local/bin:${PATH}; pip install --user --upgrade pip; - pip install --user cpp-coveralls; + travis_wait pip install --user cpp-coveralls; fi - if [ "${C_COMPILER}" == "gcc-7" -a "${TRAVIS_OS_NAME}" == "osx" ]; then rm -f /usr/local/include/c++; brew update; - brew install gcc@7; + travis_wait brew install gcc@7; fi - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo apt-get update -qq; sudo apt-get install -qq unzip; wget https://github.com/bazelbuild/bazel/releases/download/0.10.1/bazel-0.10.1-installer-linux-x86_64.sh --output-document bazel-installer.sh; - sudo bash bazel-installer.sh; + travis_wait sudo bash bazel-installer.sh; fi - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then curl -L -o bazel-installer.sh https://github.com/bazelbuild/bazel/releases/download/0.10.1/bazel-0.10.1-installer-darwin-x86_64.sh; - sudo bash bazel-installer.sh; + travis_wait sudo bash bazel-installer.sh; fi script: