Merge pull request #696 from brson/cifix

Fixes for CI Rust version
rust-lang · Aug 28, 2016 · 24245f8 · 24245f8
2 parents cfdfae2 + 45e7af2
commit 24245f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,3 @@
-language: rust
 sudo: required
 dist: trusty
 services:
@@ -9,71 +8,58 @@ matrix:
     # Linux builds use the `rust-slave-dist` image so we link them against a
     # "super old glibc" to ensure that it runs on as many platforms as possible.
     - os: linux
-      rust: nightly
       env: TARGET=i686-unknown-linux-gnu
            DOCKER=alexcrichton/rust-slave-dist:2015-10-20b
     - os: linux
-      rust: nightly
       env: TARGET=x86_64-unknown-linux-gnu
            DOCKER=alexcrichton/rust-slave-dist:2015-10-20b
 
     # Cross builds happen in the `rust-slave-linux-cross` image to ensure that
     # we use the right cross compilers for these targets. That image should
     # bundle all the gcc cross compilers to enable us to build OpenSSL
     - os: linux
-      rust: nightly
       env: TARGET=arm-unknown-linux-gnueabi
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=arm-unknown-linux-gnueabihf
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=armv7-unknown-linux-gnueabihf
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=aarch64-unknown-linux-gnu
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=x86_64-unknown-freebsd
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=x86_64-unknown-netbsd
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=powerpc-unknown-linux-gnu
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=powerpc64-unknown-linux-gnu
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
     - os: linux
-      rust: nightly
       env: TARGET=powerpc64le-unknown-linux-gnu
            DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
            SKIP_TESTS=1
 
     # On OSX we want to target 10.7 so we ensure that the appropriate
     # environment variable is set to tell the linker what we want.
     - os: osx
-      rust: nightly
       env: TARGET=i686-apple-darwin
            MACOSX_DEPLOYMENT_TARGET=10.7
     - os: osx
-      rust: nightly
       env: TARGET=x86_64-apple-darwin
            MACOSX_DEPLOYMENT_TARGET=10.7
 
@@ -98,15 +84,15 @@ script:
       docker run
         --entrypoint bash
         -u `id -u`:`id -g`
-        -v `rustc --print sysroot`:/travis-rust:ro
+        -v $HOME/rust:/travis-rust:ro
         -v `pwd`:/buildslave:ro
         -v `pwd`/target:/buildslave/target
         -e TARGET=$TARGET
         -e SKIP_TESTS=$SKIP_TESTS
         -it $DOCKER
         ci/run-docker.sh;
     else
-      sh ci/run.sh;
+      PATH=$HOME/rust/bin:$PATH sh ci/run.sh;
     fi
   # Install kcov dependencies
   # FIXME: busted!

diff --git a/appveyor.yml b/appveyor.yml
@@ -22,9 +22,8 @@ install:
   # Install rust, x86_64-pc-windows-msvc host
   # FIXME: switch back to win.rustup.rs
   - curl -sSf -o rustup-init.exe https://dev-static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe
-  - rustup-init.exe -y
+  - rustup-init.exe -y --default-toolchain=nightly-2016-08-10-x86_64-pc-windows-msvc
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustup default nightly-2016-08-10-x86_64-pc-windows-msvc
 
   # Install the target we're compiling for
   - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%

diff --git a/ci/run.sh b/ci/run.sh
@@ -2,6 +2,11 @@
 
 set -ex
 
+echo "toolchain versions\n------------------"
+
+rustc -vV
+cargo -vV
+
 cargo build --release --target $TARGET
 
 if [ -z "$SKIP_TESTS" ]; then