WIP

Author: kennytm

.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: type = pull_request AND branch = auto
 
     - env: IMAGE=dist-x86_64-linux DEPLOY=1
-      if: branch = try OR branch = auto
+      if: branch = try AND 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 = try AND branch = auto
 
     - env: >
         RUST_CHECK_TARGET=dist
@@ -169,15 +169,15 @@ matrix:
     - env: IMAGE=x86_64-gnu-aux
       if: branch = auto
     - env: IMAGE=x86_64-gnu-tools
-      if: branch = auto
+      if: branch = try
     - env: IMAGE=x86_64-gnu-debug
       if: branch = auto
     - env: IMAGE=x86_64-gnu-nopt
       if: branch = auto
     - env: IMAGE=x86_64-gnu-distcheck
       if: branch = auto
     - env: IMAGE=mingw-check
-      if: type = pull_request OR branch = auto
+      if: type = pull_request AND branch = auto
 
     - stage: publish toolstate
       if: branch = master AND type = push

src/ci/docker/x86_64-gnu-tools/checktools.sh

@@ -26,7 +26,7 @@ touch "$TOOLSTATE_FILE"
 # Try to test all the tools and store the build/test success in the TOOLSTATE_FILE
 
 set +e
-python2.7 "$X_PY" test --no-fail-fast \
+echo python2.7 "$X_PY" test --no-fail-fast \
     src/doc/book \
     src/doc/nomicon \
     src/doc/reference \

src/ci/docker/x86_64-gnu-tools/repo.sh

@@ -60,12 +60,14 @@ commit_toolstate_change() {
     OLDFLAGS="$-"
     set -eu
 
+    BRANCH=test
+
     git config --global user.email '[email protected]'
     git config --global user.name 'Rust Toolstate Update'
     git config --global credential.helper store
     printf 'https://%s:[email protected]\n' "$TOOLSTATE_REPO_ACCESS_TOKEN" \
         > "$HOME/.git-credentials"
-    git clone --depth=1 https://github.com/rust-lang-nursery/rust-toolstate.git
+    git clone --depth=1 https://github.com/rust-lang-nursery/rust-toolstate.git -b $BRANCH
 
     cd rust-toolstate
     FAILURE=1
@@ -77,10 +79,10 @@ commit_toolstate_change() {
         FAILURE=0
         git commit -a -F "$MESSAGE_FILE" || break
         # On failure randomly sleep for 0 to 3 seconds as a crude way to introduce jittering.
-        git push origin master && break || sleep $(LC_ALL=C tr -cd 0-3 < /dev/urandom | head -c 1)
+        git push origin $BRANCH && break || sleep $(LC_ALL=C tr -cd 0-3 < /dev/urandom | head -c 1)
         FAILURE=1
-        git fetch origin master
-        git reset --hard origin/master
+        git fetch origin $BRANCH
+        git reset --hard origin/$BRANCH
     done
     cd ..