From dd6549e1a29cd03fd441c21154c3b047f37e9967 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 17 Feb 2016 22:39:48 -0500 Subject: [PATCH] travis-ci only build sitl on OSX --- .travis.yml | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac98a24261..a67fb4df40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,9 +60,8 @@ before_install: elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew tap PX4/homebrew-px4 && brew update; brew update - && brew install cmake ninja astyle gcc-arm-none-eabi + && brew install cmake ninja && brew install genromfs - && brew install kconfig-frontends && sudo easy_install pip && sudo pip install pyserial empy ; @@ -93,24 +92,22 @@ env: - PX4_AWS_BUCKET=px4-travis script: - - git submodule update --init --recursive - - make check_format - - arm-none-eabi-gcc --version + - git submodule update --quiet --init --recursive - echo 'Building POSIX Firmware..' && make posix_sitl_default - echo 'Running Tests..' && make posix_sitl_default test - echo 'Running Unittests..' && cd unittests && ./run_tests.sh - - cd .. - - echo 'Building NuttX px4fmu-v1 Firmware..' && make px4fmu-v1_default - - echo 'Building NuttX px4fmu-v2 Firmware..' && make px4fmu-v2_default -# Only provide UAVCAN firmware binaries for Pixracer and Pixhawk 3 - - echo 'Building UAVCAN node firmware..' && git clone https://github.com/thiemar/vectorcontrol - - cd vectorcontrol - - BOARD=s2740vc_1_0 make && BOARD=px4esc_1_6 make - - ../Tools/uavcan_copy.sh - - cd .. - - echo 'Building NuttX px4fmu-v4 Firmware..' && make px4fmu-v4_default - - echo 'Building NuttX px4-stm32f4discovery Firmware..' && make px4-stm32f4discovery_default - - echo 'Running Tests..' && make px4fmu-v2_default test + - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then + cd ${TRAVIS_BUILD_DIR} + && make check_format + && arm-none-eabi-gcc --version + && echo 'Building NuttX px4fmu-v1 Firmware..' && make px4fmu-v1_default + && echo 'Building NuttX px4fmu-v2 Firmware..' && make px4fmu-v2_default + && echo 'Building UAVCAN node firmware..' && (git clone https://github.com/thiemar/vectorcontrol && cd vectorcontrol && BOARD=s2740vc_1_0 make -s && BOARD=px4esc_1_6 make -s && ../Tools/uavcan_copy.sh) + && echo 'Building NuttX px4fmu-v4 Firmware..' && make px4fmu-v4_default + && echo 'Building NuttX px4-stm32f4discovery Firmware..' && make px4-stm32f4discovery_default + && echo 'Running Tests..' && make px4fmu-v2_default test + ; + fi after_success: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then