File tree 3 files changed +6
-5
lines changed
3 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -62,8 +62,7 @@ matrix:
62
62
- qemu-user-static
63
63
- env : TARGET=powerpc64le-unknown-linux-gnu
64
64
os : linux
65
- services :
66
- - docker
65
+ services : docker
67
66
sudo : required
68
67
- env : TARGET=x86_64-apple-darwin
69
68
os : osx
Original file line number Diff line number Diff line change @@ -29,7 +29,9 @@ case $TARGET in
29
29
export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
30
30
;;
31
31
powerpc64le-unknown-linux-gnu)
32
- export DOCKER=y
32
+ if [[ -z $DOCKER ]]; then
33
+ export DOCKER=y
34
+ fi
33
35
export PREFIX=powerpc64le-linux-gnu-
34
36
export QEMU=qemu-ppc64le
35
37
export QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu
Original file line number Diff line number Diff line change @@ -32,8 +32,9 @@ inspect() {
32
32
}
33
33
34
34
main () {
35
- if [[ $DOCKER ]]; then
35
+ if [[ $DOCKER == " y " ]]; then
36
36
docker run \
37
+ -e DOCKER=n \
37
38
-e TARGET=$TARGET \
38
39
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
39
40
-v $( pwd) :/mnt \
@@ -44,7 +45,6 @@ main() {
44
45
run_tests
45
46
inspect
46
47
fi
47
-
48
48
}
49
49
50
50
main
You can’t perform that action at this time.
0 commit comments