diff options
| -rw-r--r-- | .travis.yml | 132 | ||||
| -rwxr-xr-x | tool/travis_retry.sh | 13 |
2 files changed, 66 insertions, 79 deletions
diff --git a/.travis.yml b/.travis.yml index 44545a705b..56c683d2aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,67 +88,51 @@ env: # sources: # - ubuntu-toolchain-r-test before_install: + - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" + - tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq" - |- - for seconds in 1 25 100 -1; do - sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break - sleep "$seconds" || exit 1 - done - - |- - for seconds in 1 25 100 -1; do - travis_apt_get_update - - sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ - gcc-8 \ - libffi-dev \ - libgdbm-dev \ - libgmp-dev \ - libjemalloc-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libreadline6-dev \ - libssl-dev \ - libyaml-dev \ - openssl \ - valgrind \ - zlib1g-dev \ - && break - - sleep "$seconds" || exit 1 - done + tool/travis_retry.sh sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ + gcc-8 \ + libffi-dev \ + libgdbm-dev \ + libgmp-dev \ + libjemalloc-dev \ + libncurses5-dev \ + libncursesw5-dev \ + libreadline6-dev \ + libssl-dev \ + libyaml-dev \ + openssl \ + valgrind \ + zlib1g-dev - &clang-8 compiler: clang-8 addons: apt: - config: - retries: true + # Not doing this manually unlike other sources, because it has been stable. sources: - llvm-toolchain-xenial-8 - # `packages` are installed in `before_install` for retries. + config: + retries: true before_install: + - tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq" - |- - for seconds in 1 25 100 -1; do - travis_apt_get_update - - sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ - clang-8 \ - llvm-8-tools \ - libffi-dev \ - libgdbm-dev \ - libgmp-dev \ - libjemalloc-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libreadline6-dev \ - libssl-dev \ - libyaml-dev \ - openssl \ - valgrind \ - zlib1g-dev \ - && break - - sleep "$seconds" || exit 1 - done + tool/travis_retry.sh sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ + clang-8 \ + llvm-8-tools \ + libffi-dev \ + libgdbm-dev \ + libgmp-dev \ + libjemalloc-dev \ + libncurses5-dev \ + libncursesw5-dev \ + libreadline6-dev \ + libssl-dev \ + libyaml-dev \ + openssl \ + valgrind \ + zlib1g-dev # -------- @@ -290,35 +274,25 @@ env: # sources: # - ubuntu-toolchain-r-test before_install: + - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" + - tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq" - |- - for seconds in 1 25 100 -1; do - sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break - sleep "$seconds" || exit 1 - done - - |- - for seconds in 1 25 100 -1; do - travis_apt_get_update - - sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ - gcc-8-multilib \ - libffi-dev:i386 \ - libffi6:i386 \ - libgdbm-dev:i386 \ - libgdbm3:i386 \ - libncurses5-dev:i386 \ - libncurses5:i386 \ - libncursesw5-dev:i386 \ - libreadline6-dev:i386 \ - libreadline6:i386 \ - libssl-dev:i386 \ - libssl1.0.0:i386 \ - linux-libc-dev:i386 \ - zlib1g-dev:i386 \ - zlib1g:i386 \ - && break - - sleep "$seconds" || exit 1 - done + tool/travis_retry.sh sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ + gcc-8-multilib \ + libffi-dev:i386 \ + libffi6:i386 \ + libgdbm-dev:i386 \ + libgdbm3:i386 \ + libncurses5-dev:i386 \ + libncurses5:i386 \ + libncursesw5-dev:i386 \ + libreadline6-dev:i386 \ + libreadline6:i386 \ + libssl-dev:i386 \ + libssl1.0.0:i386 \ + linux-libc-dev:i386 \ + zlib1g-dev:i386 \ + zlib1g:i386 - &pedanticism name: -std=c99 -pedantic diff --git a/tool/travis_retry.sh b/tool/travis_retry.sh new file mode 100755 index 0000000000..9b79c56550 --- /dev/null +++ b/tool/travis_retry.sh @@ -0,0 +1,13 @@ +#!/bin/sh -eu +# The modified version of `travis_retry` to support custom backoffs, which is used by .travis.yml. +# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_retry.bash + +for sleep in 0 ${WAITS:- 1 25 100}; do + sleep "$sleep" + + echo "+ $@" + if "$@"; then + exit 0 + fi +done +exit 1 |