Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
0a80ee6c
Commit
0a80ee6c
authored
7 years ago
by
Daniel Agar
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
OSX builds travis-ci -> circleci (#7157)
parent
6ec2ff91
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+0
-7
0 additions, 7 deletions
.travis.yml
circle.yml
+14
-10
14 additions, 10 deletions
circle.yml
with
14 additions
and
17 deletions
.travis.yml
+
0
−
7
View file @
0a80ee6c
...
...
@@ -34,17 +34,12 @@ matrix:
services
:
-
docker
env
:
BUILD_TARGET=px4_metadata
-
os
:
osx
sudo
:
true
osx_image
:
xcode8
env
:
BUILD_TARGET=tests
cache
:
ccache
:
true
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}" = "osx" ]; then sudo -H easy_install pip && sudo -H pip install empy jinja2; fi
env
:
global
:
...
...
@@ -68,8 +63,6 @@ script:
./Tools/docker_run.sh 'make px4_metadata';
elif [[ "${BUILD_TARGET}" = "clang-tidy" ]]; then
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
after_success
:
...
...
This diff is collapsed.
Click to expand it.
circle.yml
+
14
−
10
View file @
0a80ee6c
machine
:
services
:
-
docker
xcode
:
version
:
8.2
checkout
:
post
:
...
...
@@ -12,14 +12,18 @@ checkout:
dependencies
:
pre
:
-
sudo pip install cpp-coveralls
-
sudo apt-get install -y lcov
# PX4 OSX instructions 2017-04-28: https://dev.px4.io/en/setup/dev_env_mac.html
# 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
:
override
:
-
./Tools/docker_run.sh 'make tests_coverage'
# copy test results for circleci
-
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
-
make tests
-
make px4fmu-v3_default
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment