M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't recursively call docker

This commit is contained in:
Jorge Aparicio 2016-08-08 20:53:33 -05:00
parent 1904e17b91
commit 95eb812d38
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -62,8 +62,7 @@ matrix:
- qemu-user-static - qemu-user-static
- env: TARGET=powerpc64le-unknown-linux-gnu - env: TARGET=powerpc64le-unknown-linux-gnu
os: linux os: linux
services: services: docker
- docker
sudo: required sudo: required
- env: TARGET=x86_64-apple-darwin - env: TARGET=x86_64-apple-darwin
os: osx os: osx

2
ci/env.sh
View File

@ -29,7 +29,9 @@ case $TARGET in
export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
;; ;;
powerpc64le-unknown-linux-gnu) powerpc64le-unknown-linux-gnu)
if [[ -z $DOCKER ]]; then
export DOCKER=y export DOCKER=y
fi
export PREFIX=powerpc64le-linux-gnu- export PREFIX=powerpc64le-linux-gnu-
export QEMU=qemu-ppc64le export QEMU=qemu-ppc64le
export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu

4
ci/script.sh
View File

@ -32,8 +32,9 @@ inspect() {
} }
main() { main() {
if [[ $DOCKER ]]; then if [[ $DOCKER == "y" ]]; then
docker run \ docker run \
-e DOCKER=n \
-e TARGET=$TARGET \ -e TARGET=$TARGET \
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
-v $(pwd):/mnt \ -v $(pwd):/mnt \
@ -44,7 +45,6 @@ main() {
run_tests run_tests
inspect inspect
fi fi
} }
main main