Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/rust
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: kennytm/rust
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: use-1.1.1.1-as-default-dns
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Jun 30, 2018

  1. Copy the full SHA
    e585ad2 View commit details
Showing with 12 additions and 6 deletions.
  1. +3 −4 .travis.yml
  2. +2 −1 src/ci/docker/mingw-check/Dockerfile
  3. +1 −1 src/ci/docker/run.sh
  4. +6 −0 src/ci/run.sh
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