diff --git a/.travis.yml b/.travis.yml index 6d3d431..dee71f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/ci/env.sh b/ci/env.sh index ed4e1b0..7458372 100644 --- a/ci/env.sh +++ b/ci/env.sh @@ -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 diff --git a/ci/script.sh b/ci/script.sh index 1013208..1e23656 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -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