don't recursively call docker
This commit is contained in:
parent
1904e17b91
commit
95eb812d38
|
@ -62,8 +62,7 @@ matrix:
|
|||
- qemu-user-static
|
||||
- env: TARGET=powerpc64le-unknown-linux-gnu
|
||||
os: linux
|
||||
services:
|
||||
- docker
|
||||
services: docker
|
||||
sudo: required
|
||||
- env: TARGET=x86_64-apple-darwin
|
||||
os: osx
|
||||
|
|
|
@ -29,7 +29,9 @@ case $TARGET in
|
|||
export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
|
||||
;;
|
||||
powerpc64le-unknown-linux-gnu)
|
||||
export DOCKER=y
|
||||
if [[ -z $DOCKER ]]; then
|
||||
export DOCKER=y
|
||||
fi
|
||||
export PREFIX=powerpc64le-linux-gnu-
|
||||
export QEMU=qemu-ppc64le
|
||||
export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu
|
||||
|
|
|
@ -32,8 +32,9 @@ inspect() {
|
|||
}
|
||||
|
||||
main() {
|
||||
if [[ $DOCKER ]]; then
|
||||
if [[ $DOCKER == "y" ]]; then
|
||||
docker run \
|
||||
-e DOCKER=n \
|
||||
-e TARGET=$TARGET \
|
||||
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
|
||||
-v $(pwd):/mnt \
|
||||
|
@ -44,7 +45,6 @@ main() {
|
|||
run_tests
|
||||
inspect
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
main
|
||||
|
|
Loading…
Reference in New Issue