From e585ad207e8c1036692d6f49e563b6d7edb41442 Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Sat, 30 Jun 2018 14:54:13 +0800
Subject: [PATCH] WIP: Swap 1.1.1.1 and 8.8.8.8.
---
.travis.yml | 7 +++----
src/ci/docker/mingw-check/Dockerfile | 3 ++-
src/ci/docker/run.sh | 2 +-
src/ci/run.sh | 6 ++++++
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2e6722cf85563..b33bb6dabe988 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,16 +13,16 @@ matrix:
include:
# Images used in testing PR and try-build should be run first.
- env: IMAGE=x86_64-gnu-llvm-3.9 RUST_BACKTRACE=1
- if: type = pull_request OR branch = auto
+ if: branch = auto
- env: IMAGE=dist-x86_64-linux DEPLOY=1
- if: branch = try OR branch = auto
+ if: branch = auto
# "alternate" deployments, these are "nightlies" but have LLVM assertions
# turned on, they're deployed to a different location primarily for
# additional testing.
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 CI_JOB_NAME=dist-x86_64-linux-alt
- if: branch = try OR branch = auto
+ if: branch = auto
- env: >
RUST_CHECK_TARGET=dist
@@ -177,7 +177,6 @@ matrix:
- env: IMAGE=x86_64-gnu-distcheck
if: branch = auto
- env: IMAGE=mingw-check
- if: type = pull_request OR branch = auto
- stage: publish toolstate
if: branch = master AND type = push
diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile
index aab339f399c59..056d46535c0a3 100644
--- a/src/ci/docker/mingw-check/Dockerfile
+++ b/src/ci/docker/mingw-check/Dockerfile
@@ -14,7 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
xz-utils \
libssl-dev \
pkg-config \
- mingw-w64
+ mingw-w64 \
+ dnsutils
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index 8913fdaa888e7..4717b78230ac1 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -119,7 +119,7 @@ fi
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"
+ args="$args --dns 1.1.1.1 --dns 1.0.0.1 --dns 8.8.8.8 --dns 8.8.4.4"
fi
exec docker \
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 5b1fb676187b1..aaf10e800fabd 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -9,6 +9,12 @@
# option. This file may not be copied, modified, or distributed
# except according to those terms.
+dig s3-us-west-1.amazonaws.com
+dig @1.1.1.1 s3-us-west-1.amazonaws.com
+dig @1.0.0.1 s3-us-west-1.amazonaws.com
+dig @8.8.8.8 s3-us-west-1.amazonaws.com
+dig @8.8.4.4 s3-us-west-1.amazonaws.com
+
set -e
if [ -n "$CI_JOB_NAME" ]; then