diff --git a/Jenkinsfile b/Jenkinsfile index 37938711f2..6be49431ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -88,6 +88,34 @@ pipeline { builds["eagle (linux)"] = createBuildNodeDockerLogin(docker_snapdragon, 'docker_hub_dagar', 'posix_eagle_default') builds["eagle (qurt)"] = createBuildNodeDockerLogin(docker_snapdragon, 'docker_hub_dagar', 'qurt_eagle_default') + // MAC OS posix_sitl_default + builds["sitl (OSX)"] = { + node('mac') { + stage("sitl (OSX)") { + checkout scm + sh "export" + sh "make distclean" + sh "ccache -z" + sh "make posix_sitl_default" + sh "ccache -s" + } + } + } + + // MAC OS nuttx_px4fmu-v4pro_default + builds["px4fmu-v4pro (OSX)"] = { + node('mac') { + stage("px4fmu-v4pro (OSX)") { + checkout scm + sh "export" + sh "make distclean" + sh "ccache -z" + sh "make nuttx_px4fmu-v4pro_default" + sh "ccache -s" + } + } + } + parallel builds } // script } // steps diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 886b5fdb89..0000000000 --- a/circle.yml +++ /dev/null @@ -1,33 +0,0 @@ -machine: - xcode: - version: 8.3.3 - -checkout: - post: - # workaround for known git bug where attempting to fetch a missing commit fails early on the first try - - git config --global url."git://".insteadOf https:// - - git submodule update --init --recursive || true - - git submodule sync --recursive - - git submodule deinit -f . && rm -rf .git/modules - - git submodule update --init --recursive --force - - make distclean - -dependencies: - pre: - # PX4 OSX instructions 2017-07-28: https://dev.px4.io/en/setup/dev_env_mac.html - - # After installing Homebrew, run these commands in your shell to install the common tools: - - brew update - - brew tap PX4/px4 - - brew install px4-dev - - # Install pip if you don't already have it and use it to install the required packages: - - sudo easy_install pip - - sudo -H pip install pyserial empy toml pandas jinja2 - -test: - override: - #- NO_NINJA_BUILD=1 make -j2 quick_check - - make posix_sitl_default - - make px4fmu-v4pro_default - - make tests