diff options
| author | kennytm <kennytm@gmail.com> | 2018-06-08 07:05:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 07:05:48 +0800 |
| commit | 34cd36e2f2ea21e5eb8b35deaae081c434ce46f3 (patch) | |
| tree | 002a2b4d6808c7654d3dab6a5956fc882d8ebd13 | |
| parent | e46ef1bb86f9f206da06e9d5b313f0ca31809832 (diff) | |
| parent | 32e8bda4e35ada92beab7236d62520e6c6df8596 (diff) | |
| download | rust-34cd36e2f2ea21e5eb8b35deaae081c434ce46f3.tar.gz rust-34cd36e2f2ea21e5eb8b35deaae081c434ce46f3.zip | |
Rollup merge of #51420 - kennytm:some-network-issues, r=Mark-Simulacrum
Tries to address the recent network issues 1. Set the DNS server to 8.8.8.8/8.8.4.4/1.1.1.1/1.0.0.1 to workaround the daily "Cannot resolve host" error these two weeks. 2. Remove the unnecessary command `gem update --system` (originally added as experiment of the "Could not find a valid gem" error, which turns out to be useless).
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 9e62b895ed2..c154f3d8e25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -301,7 +301,6 @@ before_deploy: rm -rf obj/build/dist/doc && cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT; fi - - travis_retry gem update --system - ls -la deploy/$TRAVIS_COMMIT deploy: diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 3465e386cd9..8913fdaa888 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -118,6 +118,10 @@ fi # goes ahead and sets it for all builders. args="$args --privileged" +if [ "$CI" != "" ]; then + args="$args --dns 8.8.8.8 --dns 8.8.4.4 --dns 1.1.1.1 --dns 1.0.0.1" +fi + exec docker \ run \ --volume "$root_dir:/checkout:ro" \ |