From 4072e6c57a8fc7a4a97d3e8c7aaac604e02c12c6 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 15 Aug 2018 10:49:55 -0400 Subject: [PATCH] Jenkinsfile use QGC Airmap API header --- Jenkinsfile | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6366cbd97..5f4fb9d67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -81,6 +81,9 @@ pipeline { sh 'git submodule deinit -f .' sh 'git clean -ff -x -d .' sh 'git submodule update --init --recursive --force' + withCredentials([file(credentialsId: 'QGC_Airmap_api_key', variable: 'AIRMAP_API_HEADER')]) { + sh 'cp $AIRMAP_API_HEADER ${WORKSPACE}/src/Airmap/Airmap_api_key.h' + } sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn' sh 'cd build; make -j`nproc --all`' sh 'ccache -s' @@ -131,20 +134,43 @@ pipeline { QGC_CONFIG = 'installer' QMAKE_VER = "5.11.0/clang_64/bin/qmake" } - steps { - sh 'export' - sh 'ccache -z' - sh 'git submodule deinit -f .' - sh 'git clean -ff -x -d .' - sh 'git submodule update --init --recursive --force' - sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn' - sh 'cd build; make -j`sysctl -n hw.ncpu`' - sh 'ccache -s' + stages { + stage('Clean Checkout') { + steps { + sh 'export' + sh 'ccache -z' + sh 'git submodule deinit -f .' + sh 'git clean -ff -x -d .' + sh 'git submodule update --init --recursive --force' + } + } + + stage('Add Airmap API key') { + steps { + withCredentials([file(credentialsId: 'QGC_Airmap_api_key', variable: 'AIRMAP_API_HEADER')]) { + sh 'cp $AIRMAP_API_HEADER ${WORKSPACE}/src/Airmap/Airmap_api_key.h' + } + } + when { + anyOf { + branch 'master'; + branch 'Airmap'; + branch 'pr-airmap_api_key'; + branch 'Stable_*' + } + } + } + + stage('Build OSX Release') { + steps { + sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn' + sh 'cd build; make -j`sysctl -n hw.ncpu`' + archiveArtifacts(artifacts: 'build/**/*.dmg', fingerprint: true) + sh 'ccache -s' + } + } } post { - success { - archiveArtifacts(artifacts: 'build/**/*.dmg', fingerprint: true) - } cleanup { sh 'git clean -ff -x -d .' } -- 2.22.0