about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-08-17 00:54:45 +0800
committerkennytm <kennytm@gmail.com>2018-08-17 00:54:45 +0800
commita68e61a9f207fd2be27584bbea184822e22d8cfe (patch)
tree50666bedb1ad56a87d3a43002c3ea48ba9e8f9ae /src
parent1cb13b296d992e36f7070f642b0f7de1b81fa525 (diff)
parentb75f1bade0b108f79ac6025f27aeb6937759673b (diff)
downloadrust-a68e61a9f207fd2be27584bbea184822e22d8cfe.tar.gz
rust-a68e61a9f207fd2be27584bbea184822e22d8cfe.zip
Rollup merge of #53234 - kennytm:debug-9696, r=alexcrichton
Remove Travis shutdown debug scripts, and remove CI-specific DNS settings

Since the cause of the host shutdown (travis-ci/travis-ci#4924) is found, we could revert the shutdown debug attempts to shorten the logs.

Additionally, we're pretty sure a custom DNS (added in  will not help travis-ci/travis-ci#9696, so reverting that part of #51420 to reduce CI-specific settings.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/ci/docker/run.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index b1ee636644e..3a7714d32fa 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -119,10 +119,6 @@ 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" \