Skip to content

Commit 34cd36e

Browse files
authored
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).
2 parents e46ef1b + 32e8bda commit 34cd36e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ before_deploy:
301301
rm -rf obj/build/dist/doc &&
302302
cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT;
303303
fi
304-
- travis_retry gem update --system
305304
- ls -la deploy/$TRAVIS_COMMIT
306305

307306
deploy:

src/ci/docker/run.sh

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ fi
118118
# goes ahead and sets it for all builders.
119119
args="$args --privileged"
120120

121+
if [ "$CI" != "" ]; then
122+
args="$args --dns 8.8.8.8 --dns 8.8.4.4 --dns 1.1.1.1 --dns 1.0.0.1"
123+
fi
124+
121125
exec docker \
122126
run \
123127
--volume "$root_dir:/checkout:ro" \

0 commit comments

Comments
 (0)