summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-03-23 08:09:00 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-03-23 11:29:57 -0700
commit9a55bc102786197879013b017cb851e23e59971e (patch)
tree7e25c61b741f0b50d1da568481d3d5cc578a52bc /.travis.yml
parent863fb885860deef3f605db1e4af0d8a1794d8d9b (diff)
downloadrust-libc-9a55bc102786197879013b017cb851e23e59971e.tar.gz
Get CI working again
A few changes have necessitated some updates on our end
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml19
1 files changed, 9 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 93236a8d0c..22d86e033b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ dist: trusty
services:
- docker
install:
- - curl https://static.rust-lang.org/rustup.sh |
- sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`
+ - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
script:
- cargo build
- cargo build --no-default-features
@@ -24,26 +23,26 @@ matrix:
include:
# 1.0.0 compat
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: 1.0.0
script: cargo build
install:
# build documentation
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: nightly
script: sh ci/dox.sh
# stable compat
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: stable
- os: linux
env: TARGET=i686-unknown-linux-gnu
rust: stable
- os: osx
- env: TARGET=x86_64-apple-darwin
+ env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: stable
- os: osx
env: TARGET=i686-apple-darwin
@@ -101,18 +100,18 @@ matrix:
# beta
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: beta
- os: osx
- env: TARGET=x86_64-apple-darwin
+ env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: beta
# nightly
- os: linux
- env: TARGET=x86_64-unknown-linux-gnu
+ env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
rust: nightly
- os: osx
- env: TARGET=x86_64-apple-darwin
+ env: TARGET=x86_64-apple-darwin NO_ADD=1
rust: nightly
# QEMU based targets that compile in an emulator