Skip to content

Commit e585ad2

Browse files
committed
WIP: Swap 1.1.1.1 and 8.8.8.8.
1 parent 87ecf54 commit e585ad2

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ matrix:
1313
include:
1414
# Images used in testing PR and try-build should be run first.
1515
- env: IMAGE=x86_64-gnu-llvm-3.9 RUST_BACKTRACE=1
16-
if: type = pull_request OR branch = auto
16+
if: branch = auto
1717

1818
- env: IMAGE=dist-x86_64-linux DEPLOY=1
19-
if: branch = try OR branch = auto
19+
if: branch = auto
2020

2121
# "alternate" deployments, these are "nightlies" but have LLVM assertions
2222
# turned on, they're deployed to a different location primarily for
2323
# additional testing.
2424
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 CI_JOB_NAME=dist-x86_64-linux-alt
25-
if: branch = try OR branch = auto
25+
if: branch = auto
2626

2727
- env: >
2828
RUST_CHECK_TARGET=dist
@@ -177,7 +177,6 @@ matrix:
177177
- env: IMAGE=x86_64-gnu-distcheck
178178
if: branch = auto
179179
- env: IMAGE=mingw-check
180-
if: type = pull_request OR branch = auto
181180

182181
- stage: publish toolstate
183182
if: branch = master AND type = push

src/ci/docker/mingw-check/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
xz-utils \
1515
libssl-dev \
1616
pkg-config \
17-
mingw-w64
17+
mingw-w64 \
18+
dnsutils
1819

1920
COPY scripts/sccache.sh /scripts/
2021
RUN sh /scripts/sccache.sh

src/ci/docker/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fi
119119
args="$args --privileged"
120120

121121
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"
122+
args="$args --dns 1.1.1.1 --dns 1.0.0.1 --dns 8.8.8.8 --dns 8.8.4.4"
123123
fi
124124

125125
exec docker \

src/ci/run.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
# option. This file may not be copied, modified, or distributed
1010
# except according to those terms.
1111

12+
dig s3-us-west-1.amazonaws.com
13+
dig @1.1.1.1 s3-us-west-1.amazonaws.com
14+
dig @1.0.0.1 s3-us-west-1.amazonaws.com
15+
dig @8.8.8.8 s3-us-west-1.amazonaws.com
16+
dig @8.8.4.4 s3-us-west-1.amazonaws.com
17+
1218
set -e
1319

1420
if [ -n "$CI_JOB_NAME" ]; then

0 commit comments

Comments
 (0)