Skip to content

Commit 95eb812

Browse files
author
Jorge Aparicio
committed
don't recursively call docker
1 parent 1904e17 commit 95eb812

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ matrix:
6262
- qemu-user-static
6363
- env: TARGET=powerpc64le-unknown-linux-gnu
6464
os: linux
65-
services:
66-
- docker
65+
services: docker
6766
sudo: required
6867
- env: TARGET=x86_64-apple-darwin
6968
os: osx

ci/env.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ case $TARGET in
2929
export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
3030
;;
3131
powerpc64le-unknown-linux-gnu)
32-
export DOCKER=y
32+
if [[ -z $DOCKER ]]; then
33+
export DOCKER=y
34+
fi
3335
export PREFIX=powerpc64le-linux-gnu-
3436
export QEMU=qemu-ppc64le
3537
export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu

ci/script.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ inspect() {
3232
}
3333

3434
main() {
35-
if [[ $DOCKER ]]; then
35+
if [[ $DOCKER == "y" ]]; then
3636
docker run \
37+
-e DOCKER=n \
3738
-e TARGET=$TARGET \
3839
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
3940
-v $(pwd):/mnt \
@@ -44,7 +45,6 @@ main() {
4445
run_tests
4546
inspect
4647
fi
47-
4848
}
4949

5050
main

0 commit comments

Comments
 (0)