mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-02 11:59:17 +08:00
OSX builds travis-ci -> circleci (#7157)
This commit is contained in:
@@ -34,17 +34,12 @@ matrix:
|
|||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
env: BUILD_TARGET=px4_metadata
|
env: BUILD_TARGET=px4_metadata
|
||||||
- os: osx
|
|
||||||
sudo: true
|
|
||||||
osx_image: xcode8
|
|
||||||
env: BUILD_TARGET=tests
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
ccache: true
|
ccache: true
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [[ "${TRAVIS_OS_NAME}" = "linux" && "${TRAVIS_BRANCH}" == "coverity" ]]; then sudo apt-get install genromfs && pip install empy jinja2; fi
|
- if [[ "${TRAVIS_OS_NAME}" = "linux" && "${TRAVIS_BRANCH}" == "coverity" ]]; then sudo apt-get install genromfs && pip install empy jinja2; fi
|
||||||
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then sudo -H easy_install pip && sudo -H pip install empy jinja2; fi
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
@@ -68,8 +63,6 @@ script:
|
|||||||
./Tools/docker_run.sh 'make px4_metadata';
|
./Tools/docker_run.sh 'make px4_metadata';
|
||||||
elif [[ "${BUILD_TARGET}" = "clang-tidy" ]]; then
|
elif [[ "${BUILD_TARGET}" = "clang-tidy" ]]; then
|
||||||
PX4_DOCKER_REPO=px4io/px4-dev-clang:2017-04-22 ./Tools/docker_run.sh 'make clang-tidy-parallel';
|
PX4_DOCKER_REPO=px4io/px4-dev-clang:2017-04-22 ./Tools/docker_run.sh 'make clang-tidy-parallel';
|
||||||
elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
|
|
||||||
make tests;
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
|
|||||||
+14
-10
@@ -1,6 +1,6 @@
|
|||||||
machine:
|
machine:
|
||||||
services:
|
xcode:
|
||||||
- docker
|
version: 8.2
|
||||||
|
|
||||||
checkout:
|
checkout:
|
||||||
post:
|
post:
|
||||||
@@ -12,14 +12,18 @@ checkout:
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
pre:
|
pre:
|
||||||
- sudo pip install cpp-coveralls
|
# PX4 OSX instructions 2017-04-28: https://dev.px4.io/en/setup/dev_env_mac.html
|
||||||
- sudo apt-get install -y lcov
|
|
||||||
|
# After installing Homebrew, copy these commands to your shell:
|
||||||
|
- brew tap PX4/px4
|
||||||
|
- brew update
|
||||||
|
- brew install genromfs gcc-arm-none-eabi ninja
|
||||||
|
|
||||||
|
# Then install the required python packages:
|
||||||
|
- sudo -H easy_install pip
|
||||||
|
- sudo -H pip install empy jinja2
|
||||||
|
|
||||||
test:
|
test:
|
||||||
override:
|
override:
|
||||||
- ./Tools/docker_run.sh 'make tests_coverage'
|
- make tests
|
||||||
# copy test results for circleci
|
- make px4fmu-v3_default
|
||||||
- mkdir -p $CIRCLE_TEST_REPORTS/junit/ && cp ./build_posix_sitl_default/JUnitTestResults.xml build_unittest/test_detail.xml $CIRCLE_TEST_REPORTS/junit/
|
|
||||||
- mkdir -p $CIRCLE_ARTIFACTS && cp -R coverage-html $CIRCLE_ARTIFACTS
|
|
||||||
# only post to coveralls if not a fork PR
|
|
||||||
- if [ -z ${CIRCLE_PR_USERNAME}]; then cpp-coveralls -l coverage.info; fi
|
|
||||||
|
|||||||
Reference in New Issue
Block a user