Skip to content
Snippets Groups Projects
Commit 8a97e13b authored by Gus Grubba's avatar Gus Grubba
Browse files

Use Jenkins, per machine env var defined path to Qt

Use runtime discovery of cpu core count
parent ba1ccff7
Branches
No related tags found
No related merge requests found
...@@ -8,7 +8,6 @@ pipeline { ...@@ -8,7 +8,6 @@ pipeline {
node { node {
label 'mac' label 'mac'
} }
} }
environment { environment {
QT_FATAL_WARNINGS = '1' QT_FATAL_WARNINGS = '1'
...@@ -19,8 +18,8 @@ pipeline { ...@@ -19,8 +18,8 @@ pipeline {
sh 'git clean -ff -x -d .' sh 'git clean -ff -x -d .'
sh 'git submodule update --init --recursive --force' sh 'git submodule update --init --recursive --force'
sh 'rm -rf ${SHADOW_BUILD_DIR}; mkdir -p ${SHADOW_BUILD_DIR}' sh 'rm -rf ${SHADOW_BUILD_DIR}; mkdir -p ${SHADOW_BUILD_DIR}'
sh 'cd ${SHADOW_BUILD_DIR}; ~/Qt/5.9.3/clang_64/bin/qmake -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=release CONFIG+=WarningsAsErrorsOn' sh 'cd ${SHADOW_BUILD_DIR}; ${QT_BIN_PATH}/5.9.3/clang_64/bin/qmake -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=release CONFIG+=WarningsAsErrorsOn'
sh 'cd ${SHADOW_BUILD_DIR}; make -j24' sh 'cd ${SHADOW_BUILD_DIR}; make -j`sysctl -n hw.ncpu`'
sh 'ccache -s' sh 'ccache -s'
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment