mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-27 07:33:33 +08:00
Makefile cleanup and travis-ci s3 deploy (#6329)
- pulls more of the travis-ci s3 deploy into the repo so we can potentially migrate to another CI system - fixed the sizes output and added verbose compiler version to cmake (#6322) - fixed filenames for firmware uploaded to s3 (was broken by the changes yesterday) - fixed some broken git version display in cmake - Makefile organization - simplified .travis.yml - added a print to know which config the nuttx patch was being applied to - docker_run.sh now respects PX4_DOCKER_REPO for setting the docker image, but defaults to the good production nuttx image
This commit is contained in:
+17
-4
@@ -1,15 +1,28 @@
|
||||
#! /bin/bash
|
||||
|
||||
if [ -z "$PX4_DOCKER_REPO" ]; then
|
||||
PX4_DOCKER_REPO=px4io/px4-dev-nuttx:2017-01-14
|
||||
fi
|
||||
|
||||
PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||
SRC_DIR=$PWD/../
|
||||
|
||||
CCACHE_DIR=${HOME}/.ccache
|
||||
mkdir -p ${CCACHE_DIR}
|
||||
|
||||
X11_TMP=/tmp/.X11-unix
|
||||
|
||||
docker run -it --rm -w ${SRC_DIR} \
|
||||
-v ${SRC_DIR}:${SRC_DIR}:rw \
|
||||
-v /tmp/.X11-unix:/tmp/.X11-unix:ro \
|
||||
-v ${CCACHE_DIR}:${CCACHE_DIR}:rw \
|
||||
-e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
|
||||
-e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
|
||||
-e CCACHE_DIR=${CCACHE_DIR} \
|
||||
-e CI=${CI} \
|
||||
-e DISPLAY=$DISPLAY \
|
||||
-e GIT_SUBMODULES_ARE_EVIL=1 \
|
||||
-e LOCAL_USER_ID=`id -u` \
|
||||
px4io/px4-dev-nuttx:2017-01-08 /bin/bash -c "$@"
|
||||
-e TRAVIS_BRANCH=${TRAVIS_BRANCH} \
|
||||
-e TRAVIS_BUILD_ID=${TRAVIS_BUILD_ID} \
|
||||
-v ${CCACHE_DIR}:${CCACHE_DIR}:rw \
|
||||
-v ${SRC_DIR}:${SRC_DIR}:rw \
|
||||
-v ${X11_TMP}:${X11_TMP}:ro \
|
||||
${PX4_DOCKER_REPO} /bin/bash -c "$@"
|
||||
|
||||
Reference in New Issue
Block a user