Gate Travis builds by default

Author: alexcrichton

.travis.yml

@@ -2,6 +2,7 @@ sudo: required
 dist: trusty
 services:
   - docker
+language: rust
 
 matrix:
   include:
@@ -118,33 +119,23 @@ branches:
     - stable
     - auto
 
-notifications:
-  webhooks: http://buildbot.rust-lang.org/homu/travis
-
 install:
-  - sudo pip install awscli
-  - aws configure set preview.cloudfront true
-  - curl https://static.rust-lang.org/rustup.sh |
-    sh -s -- --prefix=$HOME/rust --spec=nightly-2017-04-25 --with-target=$TARGET
+  - rustup target add $TARGET
 
 script:
-  - mkdir -p target/$TARGET
-  - if [ ! -z "$DOCKER" ]; then
-      sh ci/build-run-docker.sh "$DOCKER" "$TARGET" "$SKIP_TESTS";
+  - mkdir -p target/$TARGET;
+  - >
+    if [[ "$TRAVIS_PULL_REQUEST" == "false" || "$ALLOW_PR" == "1" ]]; then
+        if [ ! -z "$DOCKER" ]; then
+            sh ci/build-run-docker.sh "$DOCKER" "$TARGET" "$SKIP_TESTS";
+        else
+            PATH=$HOME/rust/bin:$PATH sh ci/run.sh;
+        fi
     else
-      PATH=$HOME/rust/bin:$PATH sh ci/run.sh;
+        echo 'skipping build';
     fi
-  # Install kcov dependencies
-  # FIXME: busted!
-  #- if [ "$TARGET" == "x86_64-unknown-linux-gnu" ]; then
-  #    wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz;
-  #    tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make;
-  #    sudo make install && cd ../..;
-  #    echo "Uploading coverage... $TRAVIS_JOB_ID";
-  #    find target/debug/deps/*-* -executable -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
-  #    find target/debug/*-* -executable ! -name rustup-rs -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
-  #  fi
-  # prepare for a deploy if this will be a deployment
+
+before_deploy:
   - bash ci/prepare-deploy-travis.sh
 
 deploy:
@@ -163,4 +154,6 @@ deploy:
 
 # FIXME: I don't know if this really works
 after_deploy:
+  - sudo pip install awscli
+  - aws configure set preview.cloudfront true
   - aws cloudfront create-invalidation --paths "rustup/$TARGET/* rustup/dev/$TARGET/* rustup/www/* rustup/dev/www/* rustup/* rustup/dev/*"

appveyor.yml

@@ -1,16 +1,17 @@
 image: Visual Studio 2017
 environment:
-  RUSTFLAGS: -Zunstable-options -Ctarget-feature=+crt-static
+  RUSTFLAGS: -Ctarget-feature=+crt-static
   matrix:
+  - TARGET: x86_64-pc-windows-msvc
+    ALLOW_PR: 1
+  - TARGET: i686-pc-windows-msvc
   # FIXME
   #- TARGET: i686-pc-windows-msvc
   #  BUILD_MSI: 1
   - TARGET: i686-pc-windows-gnu
     MINGW_DIR: mingw32
   - TARGET: x86_64-pc-windows-gnu
     MINGW_DIR: mingw64
-  - TARGET: i686-pc-windows-msvc
-  - TARGET: x86_64-pc-windows-msvc
   access_token:
     secure: q8Wqx0brgfpOYFQqWauvucE2h0o1WYb41a3gKaCKV9QiE4eTz6qLNlqyC3mdsp4Q
 branches:
@@ -20,6 +21,9 @@ branches:
     - auto
 
 install:
+  # If this is a PR and we're not allowed to test PRs, skip the whole build
+  - if defined APPVEYOR_PULL_REQUEST_NUMBER if NOT defined ALLOW_PR appveyor exit
+
   # Install MSYS2 and MINGW (32-bit & 64-bit)
   - ps: |
       # Check if MSYS2 was restored from cache
@@ -28,12 +32,12 @@ install:
           # Download and install MINGW (32-bit)
           Write-Host "Installing MinGW (32-bit)..." -ForegroundColor Cyan
           Write-Host "Downloading installation package..."
-          appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -FileName mingw.7z
+          appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -FileName mingw.7z
         } elseif($env:MINGW_DIR -eq "mingw64") {
           # Download and install MINGW (64-bit)
           Write-Host "Installing MinGW (64-bit)..." -ForegroundColor Cyan
           Write-Host "Downloading installation package..."
-          appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -FileName mingw.7z
+          appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -FileName mingw.7z
         }
         Write-Host "Extracting installation package..."
         7z x -y mingw.7z -oC:\msys64 | Out-Null
@@ -43,8 +47,8 @@ install:
       }
 
   # Install rust, x86_64-pc-windows-msvc host
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-toolchain=nightly-2017-04-25-x86_64-pc-windows-msvc
+  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -y --default-host=x86_64-pc-windows-msvc
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
 
   # Install the target we're compiling for

src/rustup-mock/src/mock_bin_src.rs

@@ -2,17 +2,46 @@ use std::env::consts::EXE_SUFFIX;
 use std::env;
 use std::fs::File;
 use std::io::{self, Write, Read};
+use std::path::PathBuf;
 use std::process::Command;
 
 fn main() {
     let mut args = env::args().skip(1);
     match args.next().as_ref().map(|s| &**s) {
         Some("--version") => {
-            let me = env::current_exe().unwrap().display().to_string();
-            let version_file = format!("{}.version", me);
-            let hash_file = format!("{}.version-hash", me);
+            let me = env::current_exe().unwrap();
+            let mut version_file = PathBuf::from(format!("{}.version", me.display()));
+            let mut hash_file = PathBuf::from(format!("{}.version-hash", me.display()));
             let mut version = String::new();
             let mut hash = String::new();
+            if !version_file.exists() {
+                // There's a "MAJOR HACKS" statement in `toolchain.rs` right
+                // now where custom toolchains use a `cargo.exe` that's
+                // temporarily located elsewhere so they can execute the correct
+                // `rustc.exe`. This means that our dummy version files may not
+                // be just next to use.
+                //
+                // Detect this here and work around it.
+                assert!(cfg!(windows));
+                assert!(env::var_os("RUSTUP_TOOLCHAIN").is_some());
+                let mut alt = me.clone();
+                alt.pop(); // remove our filename
+                assert!(alt.ends_with("fallback"));
+                alt.pop(); // pop 'fallback'
+                alt.push("toolchains");
+
+                let mut part = PathBuf::from("bin");
+                part.push(me.file_name().unwrap());
+
+                let toolchain = alt.read_dir().unwrap()
+                    .map(|e| e.unwrap().path())
+                    .find(|p| p.join(&part).exists())
+                    .unwrap();
+                let path = toolchain.join(part);
+
+                version_file = format!("{}.version", path.display()).into();
+                hash_file = format!("{}.version-hash", path.display()).into();
+            }
             File::open(&version_file).unwrap().read_to_string(&mut version).unwrap();
             File::open(&hash_file).unwrap().read_to_string(&mut hash).unwrap();
             println!("{} ({})", version, hash);