Run more extra targets on nightly

This commit is contained in:
Alex Crichton 2015-10-29 10:06:09 -07:00
parent b017b5e72f
commit 657eeec3b6
2 changed files with 29 additions and 22 deletions

View File

@ -21,19 +21,19 @@ matrix:
include: include:
- os: linux - os: linux
env: TARGET=arm-linux-androideabi env: TARGET=arm-linux-androideabi
rust: nightly-2015-09-08 rust: nightly
- os: linux - os: linux
env: TARGET=x86_64-unknown-linux-musl env: TARGET=x86_64-unknown-linux-musl
rust: nightly-2015-09-08 rust: nightly
- os: linux - os: linux
env: TARGET=arm-unknown-linux-gnueabihf env: TARGET=arm-unknown-linux-gnueabihf
rust: nightly-2015-09-08 rust: nightly
- os: linux - os: linux
env: TARGET=mips-unknown-linux-gnu env: TARGET=mips-unknown-linux-gnu
rust: nightly-2015-09-08 rust: nightly
- os: linux - os: linux
env: TARGET=aarch64-unknown-linux-gnu env: TARGET=aarch64-unknown-linux-gnu
rust: nightly-2015-09-08 rust: nightly
- os: osx - os: osx
env: TARGET=i386-apple-ios env: TARGET=i386-apple-ios
rust: nightly-2015-09-08 rust: nightly-2015-09-08

View File

@ -11,6 +11,9 @@ else
fi fi
export HOST=$ARCH-$OS export HOST=$ARCH-$OS
if [ "$TARGET" = "" ]; then
TARGET=$HOST
fi
MAIN_TARGETS=https://static.rust-lang.org/dist MAIN_TARGETS=https://static.rust-lang.org/dist
EXTRA_TARGETS=https://people.mozilla.org/~acrichton/libc-test/2015-09-08 EXTRA_TARGETS=https://people.mozilla.org/~acrichton/libc-test/2015-09-08
@ -20,6 +23,27 @@ install() {
sudo apt-get install -y $@ sudo apt-get install -y $@
} }
case "$TARGET" in
*-apple-ios)
curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/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
case "$TARGET" in case "$TARGET" in
# Pull a pre-built docker image for testing android, then run tests entirely # Pull a pre-built docker image for testing android, then run tests entirely
#d within that image. #d within that image.
@ -30,33 +54,27 @@ case "$TARGET" in
;; ;;
x86_64-unknown-linux-musl) x86_64-unknown-linux-musl)
curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
install musl-tools install musl-tools
export CC=musl-gcc export CC=musl-gcc
;; ;;
arm-unknown-linux-gnueabihf) arm-unknown-linux-gnueabihf)
curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
install gcc-4.7-arm-linux-gnueabihf qemu-user install gcc-4.7-arm-linux-gnueabihf qemu-user
export CC=arm-linux-gnueabihf-gcc-4.7 export CC=arm-linux-gnueabihf-gcc-4.7
;; ;;
aarch64-unknown-linux-gnu) aarch64-unknown-linux-gnu)
curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
install gcc-aarch64-linux-gnu qemu-user install gcc-aarch64-linux-gnu qemu-user
export CC=aarch64-linux-gnu-gcc export CC=aarch64-linux-gnu-gcc
;; ;;
*-apple-ios) *-apple-ios)
curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
;; ;;
mips-unknown-linux-gnu) mips-unknown-linux-gnu)
# Download pre-built and custom MIPS libs and then also instsall the MIPS # Download pre-built and custom MIPS libs and then also instsall the MIPS
# compiler according to this post: # compiler according to this post:
# http://sathisharada.blogspot.com/2014_10_01_archive.html # http://sathisharada.blogspot.com/2014_10_01_archive.html
curl -s $EXTRA_TARGETS/$TARGET.tar.gz | tar xzf - -C $HOME/rust/lib/rustlib
echo 'deb http://ftp.de.debian.org/debian squeeze main' | \ echo 'deb http://ftp.de.debian.org/debian squeeze main' | \
sudo tee -a /etc/apt/sources.list sudo tee -a /etc/apt/sources.list
echo 'deb http://www.emdebian.org/debian/ squeeze main' | \ echo 'deb http://www.emdebian.org/debian/ squeeze main' | \
@ -67,17 +85,6 @@ case "$TARGET" in
;; ;;
*) *)
# Download the rustlib folder from the relevant portion of main distribution's
# tarballs.
pkg=rust-std-$HOST
if [ "$TRAVIS_RUST_VERSION" = "1.0.0" ]; then
pkg=rustc
fi
curl -s $MAIN_TARGETS/rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz | \
tar xzf - -C $HOME/rust/lib/rustlib --strip-components=4 \
rust-$TRAVIS_RUST_VERSION-$HOST/$pkg/lib/rustlib/$HOST
TARGET=$HOST
# clang has better error messages and implements alignof more broadly # clang has better error messages and implements alignof more broadly
export CC=clang export CC=clang