Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Swap 1.1.1.1 and 8.8.8.8. #51939

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion src/ci/docker/mingw-check/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/ci/docker/run.sh
Original file line number Diff line number Diff line change
@@ -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 \
6 changes: 6 additions & 0 deletions src/ci/run.sh
Original file line number Diff line number Diff line change
@@ -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