Skip to content

Fixes for CI Rust version #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
language: rust
sudo: required
dist: trusty
services:
Expand All @@ -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

Expand All @@ -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!
Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down
5 changes: 5 additions & 0 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

set -ex

echo "toolchain versions\n------------------"

rustc -vV
cargo -vV

cargo build --release --target $TARGET

if [ -z "$SKIP_TESTS" ]; then
Expand Down