Skip to content

Commit

Permalink
Rollup merge of rust-lang#51420 - kennytm:some-network-issues, r=Mark…
Browse files Browse the repository at this point in the history
…-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).
  • Loading branch information
kennytm authored Jun 7, 2018
2 parents e46ef1b + 32e8bda commit 34cd36e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions src/ci/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit 34cd36e

Please sign in to comment.