diff options
| author | Maxime Dénès | 2018-01-30 09:30:23 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2018-01-30 09:30:23 +0100 |
| commit | b9e8a4cbb9a78c862ffe5413471e0ea069fa0566 (patch) | |
| tree | 37308074df4e369264166675283d02e825a2101a | |
| parent | d0e05a1964fb2af093ac2a15a75bb84d342bf1ad (diff) | |
| parent | 05cfa9e92ea08210ae78ec7b6054dce3e2b3ee30 (diff) | |
Merge PR #6644: Use travis_retry on apt-get update
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rwxr-xr-x | dev/tools/sudo-apt-get-update.sh | 4 |
2 files changed, 19 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 8f1f1e699b..712357fc56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,19 @@ addons: apt: sources: - avsm - packages: - - opam - - aspcud - - gcc-multilib +## Due to issues like +## https://github.com/travis-ci/travis-ci/issues/8507 , +## https://github.com/travis-ci/travis-ci/issues/9000 , +## https://github.com/travis-ci/travis-ci/issues/9081 , and +## https://github.com/travis-ci/travis-ci/issues/9126 , we get frequent +## failures with using `packages`. Therefore, for most targets, we +## instead invoke `apt-get update` manually with `travis_retry` before +## invoking `apt-get install`, manually, below in the `install:` +## target. +# packages: +# - opam +# - aspcud +# - gcc-multilib env: global: @@ -212,6 +221,8 @@ before_install: - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then echo "Tested commit (followed by parent commits):"; git log -1; for commit in `git log -1 --format="%P"`; do echo; git log -1 $commit; done; fi install: +- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then travis_retry ./dev/tools/sudo-apt-get-update.sh -q; fi +- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo apt-get install -y opam aspcud gcc-multilib; fi - opam init -j ${NJOBS} --compiler=${COMPILER} -n -y - eval $(opam config env) - opam config list diff --git a/dev/tools/sudo-apt-get-update.sh b/dev/tools/sudo-apt-get-update.sh new file mode 100755 index 0000000000..f8bf6bed41 --- /dev/null +++ b/dev/tools/sudo-apt-get-update.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +(sudo apt-get update "$@" 2>&1 || echo 'E: update failed') | tee /tmp/apt.err +! grep -q '^\(E:\|W: Failed to fetch\)' /tmp/apt.err || exit $? |