Use nightlies for iOS and rumprun
iOS was fixed awhile back and we should have rumprun nightlies now, so let's use them!
This commit is contained in:
parent
91ef172b00
commit
c02a5c237a
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue