diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2018-01-20 22:54:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 22:54:22 +0300 |
| commit | 71ab5b00867f353a1cdedf6d04f1363989227c78 (patch) | |
| tree | ad91c2bad31bb20bf5badfb01f3d13adaa9a1742 /scripts/travis-ci | |
| parent | 031abd01f4a1d96aef64abd9ac723da8af4cb589 (diff) | |
| parent | edd1de098a2b07bd7f6308d7ed49b407dc7b6721 (diff) | |
Merge PR #3313: scripts/travis-ci: bump apt timeout in before_install.bash.
Diffstat (limited to 'scripts/travis-ci')
| -rwxr-xr-x | scripts/travis-ci/before_install.bash | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash index ce47a7085..7b1847418 100755 --- a/scripts/travis-ci/before_install.bash +++ b/scripts/travis-ci/before_install.bash @@ -8,6 +8,13 @@ MUMBLE_HOST_DEB=${MUMBLE_HOST/_/-} if [ "${TRAVIS_OS_NAME}" == "linux" ]; then + # Bump the apt http timeout to 120 seconds. + # Without this, we'd regularly get timeout errors + # from our MXE mirror on dl.mumble.info. + # + # See mumble-voip/mumble#3312 for more information. + echo 'Acquire::http::Timeout "120";' | sudo tee /etc/apt/apt.conf.d/99zzztimeout + if [ "${MUMBLE_QT}" == "qt4" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then sudo apt-get -qq update sudo apt-get build-dep -qq mumble |