Merge pull request #58 from japaric/ci

travis: use latest docker image
This commit is contained in:
Jorge Aparicio 2016-08-29 22:25:49 -05:00 committed by GitHub
commit a91bf77c44
3 changed files with 7 additions and 12 deletions

View File

@ -40,6 +40,8 @@ if [[ $TARGET != $HOST && ! $TARGET =~ ^i.86- ]]; then
;; ;;
esac esac
export CARGO_TARGET_$(echo $TARGET | tr a-z- A-Z_)_LINKER=$GCC_TRIPLE-gcc
if [[ $RUN_TESTS == y ]]; then if [[ $RUN_TESTS == y ]]; then
# NOTE(export) so this can reach the processes that `cargo test` spawns # NOTE(export) so this can reach the processes that `cargo test` spawns
export QEMU_LD_PREFIX=/usr/$GCC_TRIPLE export QEMU_LD_PREFIX=/usr/$GCC_TRIPLE

View File

@ -11,7 +11,9 @@ install_qemu() {
} }
install_gist() { install_gist() {
gem install gist -v 4.5.0 if [[ $OSX ]]; then
gem install gist -v 4.5.0
fi
} }
install_binutils() { install_binutils() {
@ -38,13 +40,6 @@ add_rustup_target() {
fi fi
} }
install_xargo() {
if [[ $CARGO == xargo ]]; then
curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
bash -s -- --from japaric/xargo --at /root/.cargo/bin --vers 0.1.5
fi
}
main() { main() {
if [[ $OSX || ${IN_DOCKER_CONTAINER:-n} == y ]]; then if [[ $OSX || ${IN_DOCKER_CONTAINER:-n} == y ]]; then
install_qemu install_qemu
@ -52,7 +47,6 @@ main() {
install_binutils install_binutils
install_rust install_rust
add_rustup_target add_rustup_target
install_xargo
fi fi
} }

View File

@ -42,8 +42,7 @@ run_tests() {
main() { main() {
if [[ $LINUX && ${IN_DOCKER_CONTAINER:-n} == n ]]; then if [[ $LINUX && ${IN_DOCKER_CONTAINER:-n} == n ]]; then
local tag=2016-08-24 # NOTE The Dockerfile of this image is in the docker branch of this repository
docker run \ docker run \
--privileged \ --privileged \
-e IN_DOCKER_CONTAINER=y \ -e IN_DOCKER_CONTAINER=y \
@ -52,7 +51,7 @@ main() {
-e TRAVIS_COMMIT=$TRAVIS_COMMIT \ -e TRAVIS_COMMIT=$TRAVIS_COMMIT \
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
-v $(pwd):/mnt \ -v $(pwd):/mnt \
japaric/rustc-builtins:$tag \ japaric/rustc-builtins \
sh -c 'cd /mnt; sh -c 'cd /mnt;
bash ci/install.sh; bash ci/install.sh;
bash ci/script.sh' bash ci/script.sh'