From abb50f2dfa2242cbbba1d84af364b92e28ccf77e Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@twistedmatrix.com>
Date: Sat, 3 Jun 2017 19:06:22 -0600
Subject: [PATCH 1/2] Deploy linux-x86_64 artifacts on try branch.

---
 .travis.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ef759b3f80..0f872d4ff99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ matrix:
     - env: IMAGE=dist-powerpc64le-linux DEPLOY=1
     - env: IMAGE=dist-s390x-linux DEPLOY=1
     - env: IMAGE=dist-x86_64-freebsd DEPLOY=1
-    - env: IMAGE=dist-x86_64-linux DEPLOY=1
+    - env: IMAGE=dist-x86_64-linux DEPLOY=1 ALLOW_TRY=1
     - env: IMAGE=dist-x86_64-musl DEPLOY=1
     - env: IMAGE=dist-x86_64-netbsd DEPLOY=1
     - env: IMAGE=emscripten
@@ -153,15 +153,15 @@ before_script:
       df -h;
       du . | sort -nr | head -n100
   - >
-      if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
-          export RUN_SCRIPT="echo 'skipping, not a full build'";
-      else
+      if [[ "$ALLOW_PR" = "1" || "$TRAVIS_BRANCH" == "auto" || ( "$ALLOW_TRY" = "1" && "$TRAVIS_BRANCH" = "try" ) ]]; then
           RUN_SCRIPT="stamp src/ci/init_repo.sh . $HOME/rustsrc";
           if [ "$TRAVIS_OS_NAME" = "osx" ]; then
               export RUN_SCRIPT="$RUN_SCRIPT && stamp src/ci/run.sh";
           else
               export RUN_SCRIPT="$RUN_SCRIPT && stamp src/ci/docker/run.sh $IMAGE";
           fi
+      else
+          export RUN_SCRIPT="echo 'skipping, not a full build'";
       fi
 
 script:
@@ -239,6 +239,20 @@ deploy:
       branch: auto
       condition: $DEPLOY = 1
 
+  - provider: s3
+    bucket: rust-lang-ci
+    skip_cleanup: true
+    local_dir: deploy
+    upload_dir: rustc-builds-try
+    acl: public_read
+    region: us-east-1
+    access_key_id: AKIAIPQVNYF2T3DTYIWQ
+    secret_access_key:
+      secure: "FBqDqOTeIPMu6v/WYPf4CFSlh9rLRZGKVtpLa5KkyuOhXRTrnEzBduEtS8/FMIxdQImvurhSvxWvqRybMOi4qoVfjMqqpHAI7uBbidbrvAcJoHNsx6BgUNVCIoH6a0UsAjTUtm6/YPIpzbHoLZXPL0GrHPMk6Mu04qVSmcYNWn4="
+    on:
+      branch: try
+      condition: $DEPLOY = 1 && $ALLOW_TRY = 1
+
   # this is the same as the above deployment provider except that it uploads to
   # a slightly different directory and has a different trigger
   - provider: s3

From d2ff798f3a67a6781755d9e1e757db630ac94c0d Mon Sep 17 00:00:00 2001
From: Mark Simulacrum <mark.simulacrum@gmail.com>
Date: Sat, 3 Jun 2017 12:49:03 -0600
Subject: [PATCH 2/2] Don't run travis tests on master.

This saves us builders for more helpful purposes.
---
 .travis.yml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0f872d4ff99..40fecb3ee5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -152,16 +152,30 @@ before_script:
       echo "#### Disk usage before running script:";
       df -h;
       du . | sort -nr | head -n100
+  # If we are building a pull request, do the build if $ALLOW_PR == 1
+  # Otherwise, do the build if we are on the auto branch, or the try branch and $ALLOW_TRY == 1
   - >
-      if [[ "$ALLOW_PR" = "1" || "$TRAVIS_BRANCH" == "auto" || ( "$ALLOW_TRY" = "1" && "$TRAVIS_BRANCH" = "try" ) ]]; then
+      if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+          if [[ "$ALLOW_PR" == "1" ]]; then
+              SKIP_BUILD=false;
+          else
+              SKIP_BUILD=true;
+          fi
+      elif [[ "$TRAVIS_BRANCH" == "auto" || ( "$ALLOW_TRY" == "1" && "$TRAVIS_BRANCH" == "try" ) ]]; then
+          SKIP_BUILD=false;
+      else
+          SKIP_BUILD=true;
+      fi
+
+      if [[ "$SKIP_BUILD" == true ]]; then
+          export RUN_SCRIPT="echo 'skipping, not a full build'";
+      else
           RUN_SCRIPT="stamp src/ci/init_repo.sh . $HOME/rustsrc";
           if [ "$TRAVIS_OS_NAME" = "osx" ]; then
               export RUN_SCRIPT="$RUN_SCRIPT && stamp src/ci/run.sh";
           else
               export RUN_SCRIPT="$RUN_SCRIPT && stamp src/ci/docker/run.sh $IMAGE";
           fi
-      else
-          export RUN_SCRIPT="echo 'skipping, not a full build'";
       fi
 
 script: