diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-03-05 23:21:52 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-03-05 23:21:52 -0800 |
| commit | 5f527b07f4e2e861ffb18009eb822b9ac6e0ced2 (patch) | |
| tree | 8da8d210f7c6bb26351fda61639cf7a85db3402f | |
| parent | 91ef172b007a209e588d01253c3c089f9ca20284 (diff) | |
| parent | c02a5c237a166062ba1df6324a3a631e0bf28f66 (diff) | |
| download | rust-libc-5f527b07f4e2e861ffb18009eb822b9ac6e0ced2.tar.gz | |
Merge pull request #208 from alexcrichton/moar-nightlies
Use nightlies for iOS and rumprun
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | ci/run-travis.sh | 28 |
2 files changed, 7 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index dcf4c7d3df..e6b21038d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,13 +45,13 @@ matrix: rust: nightly - os: osx env: TARGET=i386-apple-ios - rust: nightly-2016-02-12 + rust: nightly - os: osx env: TARGET=x86_64-apple-ios - rust: nightly-2016-02-12 + rust: nightly - os: linux env: TARGET=x86_64-rumprun-netbsd DOCKER=alexcrichton/rust-libc-rumprun:2015-11-27 - rust: nightly-2015-09-27 + rust: nightly - os: linux env: TARGET=x86_64-unknown-freebsd QEMU=freebsd.qcow2 rust: nightly diff --git a/ci/run-travis.sh b/ci/run-travis.sh index e4fdcff563..d9f708aa12 100644 --- a/ci/run-travis.sh +++ b/ci/run-travis.sh @@ -19,7 +19,6 @@ fi MAIN_TARGETS=https://static.rust-lang.org/dist DATE=$(echo $TRAVIS_RUST_VERSION | sed s/nightly-//) -EXTRA_TARGETS=https://people.mozilla.org/~acrichton/libc-test/$DATE if [ "$DATE" != "nightly" ]; then MAIN_TARGETS=$MAIN_TARGETS/$DATE TRAVIS_RUST_VERSION=nightly @@ -108,30 +107,11 @@ mkdir -p .cargo cp ci/cargo-config .cargo/config # Next up we need to install the standard library for the version of Rust that -# we're testing. Get fancy targets from the EXTRA_TARGETS URL and otherwise get -# all others from the official distribution. +# we're testing. if [ "$TRAVIS" = "true" ]; then - case "$TARGET" in - *-rumprun-*) - curl -s $EXTRA_TARGETS/$TARGET.tar.gz | \ - tar xzf - -C `rustc --print sysroot`/lib/rustlib - ;; - - *) - # Download the rustlib folder from the relevant portion of main - # distribution's tarballs. - dir=rust-std-$TARGET - pkg=rust-std - if [ "$TRAVIS_RUST_VERSION" = "1.0.0" ]; then - pkg=rust - dir=rustc - fi - curl -s $MAIN_TARGETS/$pkg-$TRAVIS_RUST_VERSION-$TARGET.tar.gz | \ - tar xzf - -C $HOME/rust/lib/rustlib --strip-components=4 \ - $pkg-$TRAVIS_RUST_VERSION-$TARGET/$dir/lib/rustlib/$TARGET - ;; - - esac + curl -s $MAIN_TARGETS/rust-std-$TRAVIS_RUST_VERSION-$TARGET.tar.gz | \ + tar xzf - -C $HOME/rust/lib/rustlib --strip-components=4 \ + rust-std-$TRAVIS_RUST_VERSION-$TARGET/rust-std-$TARGET/lib/rustlib/$TARGET fi # If we're testing with a docker image, then run tests entirely within that |