travis-ci use PX4_DOCKER for builds and specify tag

This commit is contained in:
Daniel Agar
2017-01-01 18:05:01 -05:00
committed by Lorenz Meier
parent 3607e72d4d
commit 9fad6f9dd2
3 changed files with 4 additions and 4 deletions

View File

@@ -11,7 +11,7 @@ matrix:
include:
- os: linux
sudo: required
env: GCC_VER=5.4 DOCKER_REPO="px4io/px4-dev-nuttx:2016-12-26"
env: GCC_VER=5.4 DOCKER_REPO="px4io/px4-dev-nuttx:2017-01-01"
services:
- docker
- os: osx
@@ -64,7 +64,7 @@ env:
script:
- ccache -M 1GB; ccache -z
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
docker run --rm -v `pwd`:`pwd`:rw -v $HOME/.ccache:$HOME/.ccache:rw -e CCACHE_DIR=$HOME/.ccache -e CI=true -e GIT_SUBMODULES_ARE_EVIL=1 -w=`pwd` -e LOCAL_USER_ID=$UID -it ${DOCKER_REPO} /bin/bash -c "make check_qgc_firmware VECTORCONTROL=0";
PX4_DOCKER=1 make check_qgc_firmware;
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
make tests;
fi

View File

@@ -97,7 +97,7 @@ SRC_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
# optionally run commmands in PX4 docker
ifdef PX4_DOCKER
PX4_RUN = docker run -it --rm -v $(SRC_DIR):$(SRC_DIR):rw -w $(SRC_DIR) -v /tmp/.X11-unix:/tmp/.X11-unix:ro -v $(HOME)/.ccache:$(HOME)/.ccache:rw -e CCACHE_DIR=$(HOME)/.ccache -e LOCAL_USER_ID=`id -u $(USER)` px4io/px4-dev-nuttx /bin/bash -c "$1"
PX4_RUN = docker run -it --rm -v $(SRC_DIR):$(SRC_DIR):rw -w $(SRC_DIR) -v /tmp/.X11-unix:/tmp/.X11-unix:ro -v $(HOME)/.ccache:$(HOME)/.ccache:rw -e CCACHE_DIR=$(HOME)/.ccache -e LOCAL_USER_ID=`id -u $(USER)` px4io/px4-dev-nuttx:2017-01-01 /bin/bash -c "$1"
else
PX4_RUN = $1
endif

View File

@@ -141,7 +141,7 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/posix-configs DESTINATION ${CMAKE_INSTAL
# tests
#
#T ODO: find a way to keep this in sync with tests_main
# TODO: find a way to keep this in sync with tests_main
set(tests
autodeclination
bson