From 3d7906647e5c6f382bf6c574927bac88d752874f Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 26 Aug 2016 09:54:49 +0200 Subject: [PATCH] Test Travis fix for OS X --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce36a58529..5fe619fb3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,20 +63,19 @@ 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 -e GIT_SUBMODULES_ARE_EVIL=1 -w=`pwd` --user=$UID -it ${DOCKER_REPO} /bin/bash -c "make check_qgc_firmware VECTORCONTROL=1"; elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then - make px4fmu-v4_default - make tests; + make tests; fi - ccache -s after_success: - - make package_firmware && mkdir s3deploy-archive && cp Firmware.zip s3deploy-archive/ -# find all px4 firmware (*.px4) and rename - - find . -type f -name 'nuttx-*-default.px4' -exec cp "{}" . \; - - 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 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml s3deploy-branch/ -# only deploy GCC 4.8 builds on master/beta/stable - - if [[ "$GCC_VER" == "4.8" && ( "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "beta" || "$TRAVIS_BRANCH" == "stable" ) ]]; then - export PX4_S3_DEPLOY=1; + - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then + make package_firmware && mkdir s3deploy-archive && cp Firmware.zip s3deploy-archive/; + find . -type f -name 'nuttx-*-default.px4' -exec cp "{}" . \; + 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 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml s3deploy-branch/; + if [[ "$GCC_VER" == "4.8" && ( "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "beta" || "$TRAVIS_BRANCH" == "stable" ) ]]; then + export PX4_S3_DEPLOY=1; + fi fi deploy: @@ -127,6 +126,7 @@ notifications: on_success: always # options: [always|never|change] default: always on_failure: always # options: [always|never|change] default: always slack: - secure: "QKw73Zel/s3JAbe/7XyO9tPnJwiiGFpYzSjdR8lG3tYFjRdXZnhxG4c+G7bkgkaPTS4Hult33VXE3kcEqOI7+C+eRwRlZhDfL0knQbXVCxjcLjzmUFdoPOwurlgZDw66PFWCi5tZcLKSRo3u4U8ibT4WKi3jm9sDSyOcfBAucMU=" + rooms: + - secure: "QKw73Zel/s3JAbe/7XyO9tPnJwiiGFpYzSjdR8lG3tYFjRdXZnhxG4c+G7bkgkaPTS4Hult33VXE3kcEqOI7+C+eRwRlZhDfL0knQbXVCxjcLjzmUFdoPOwurlgZDw66PFWCi5tZcLKSRo3u4U8ibT4WKi3jm9sDSyOcfBAucMU=" on_success: change # options: [always|never|change] default: always on_failure: always # options: [always|never|change] default: always