dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

docker update to 2016-12-26 images

This commit is contained in:
Daniel Agar 2016-12-26 19:01:29 -05:00
parent 3a17c07b1e
commit 13c7cd29b3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -11,7 +11,7 @@ matrix:
include: include:
- os: linux - os: linux
sudo: required sudo: required
env: GCC_VER=4.9 DOCKER_REPO="px4io/px4-dev-base:2016-10-20" env: GCC_VER=5.4 DOCKER_REPO="px4io/px4-dev-nuttx:2016-12-26"
services: services:
- docker - docker
- os: osx - os: osx
@ -64,7 +64,7 @@ env:
script: script:
- ccache -M 1GB; ccache -z - ccache -M 1GB; ccache -z
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - 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` --user=$UID -it ${DOCKER_REPO} /bin/bash -c "make check_qgc_firmware VECTORCONTROL=0"; 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";
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
make tests; make tests;
fi fi
@ -77,7 +77,7 @@ after_success:
&& find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4 && find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4
&& mkdir s3deploy-branch && mv *_default.px4 Meta/px4fmu-v2_default/parameters.xml Meta/px4fmu-v2_default/airframes.xml s3deploy-branch/; && mkdir s3deploy-branch && mv *_default.px4 Meta/px4fmu-v2_default/parameters.xml Meta/px4fmu-v2_default/airframes.xml s3deploy-branch/;
fi fi
- if [[ "${TRAVIS_OS_NAME}" = "linux" && "$GCC_VER" == "4.9" ]]; then - if [[ "${TRAVIS_OS_NAME}" = "linux" && "$GCC_VER" == "5.4" ]]; then
export PX4_S3_DEPLOY=1; export PX4_S3_DEPLOY=1;
fi fi
@ -120,7 +120,7 @@ deploy:
tags: true tags: true
all_branches: true all_branches: true
repo: PX4/Firmware repo: PX4/Firmware
condition: $GCC_VER = 4.9 condition: $GCC_VER = 5.4
notifications: notifications:
webhooks: webhooks:

4
circle.yml
View File

@ -12,11 +12,11 @@ checkout:
dependencies: dependencies:
pre: pre:
- docker pull px4io/px4-dev-nuttx-gcc_next:2016-10-20 - docker pull px4io/px4-dev-nuttx:2016-12-26
test: test:
override: override:
- docker run --rm -v `pwd`:`pwd`:rw -e CI=true -w=`pwd` --user=$UID -it px4io/px4-dev-nuttx-gcc_next:2016-10-20 /bin/bash -c "make quick_check" - docker run --rm -v `pwd`:`pwd`:rw -e CI=true -w=`pwd` -e LOCAL_USER_ID=$UID -it px4io/px4-dev-nuttx:2016-12-26 /bin/bash -c "make quick_check"
general: general:
artifacts: artifacts: