From e42b5804a0c166f883da50d91aefa0060606e1fb Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 20 Jun 2016 10:03:37 -0400 Subject: [PATCH] travis-ci only run make check within docker (#4854) * otherwise the build environment doesn't get the proper return code --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 12f57ed6f7..6e8742e8ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ env: script: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - docker run --rm -v `pwd`:`pwd`:rw -v $HOME/.ccache:$HOME/.ccache:rw -e CCACHE_DIR=$HOME/.ccache -w=`pwd` --user=$UID -it ${DOCKER_REPO} /bin/bash -c "ccache -z; make check VECTORCONTROL=1; ccache -s"; + docker run --rm -v `pwd`:`pwd`:rw -v $HOME/.ccache:$HOME/.ccache:rw -e CCACHE_DIR=$HOME/.ccache -w=`pwd` --user=$UID -it ${DOCKER_REPO} /bin/bash -c "make check VECTORCONTROL=1"; elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then make check_posix_sitl_default; fi