Skip to content

Q
qgroundcontrol
Unverified Commit 6cfb0544 authored by Daniel Agar's avatar Daniel Agar Committed by GitHub
Browse files
Options

Jenkins update to Qt 5.11.0 Mac & Linux (#6576)

parent deeaa6e6
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
Jenkinsfile
View file @ 6cfb0544
...@@ -9,11 +9,11 @@ pipeline { ...@@ -9,11 +9,11 @@ pipeline {
environment { environment {
CCACHE_BASEDIR = "${env.WORKSPACE}" CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'release' QGC_CONFIG = 'release'
QMAKE_VER = "5.9.2/android_armv7/bin/qmake" QMAKE_VER = "5.11.0/android_armv7/bin/qmake"
} }
agent { agent {
docker { docker {
image 'mavlink/qgc-build-android:2018-04-14' image 'mavlink/qgc-build-android:2018-06-07'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
...@@ -38,11 +38,11 @@ pipeline { ...@@ -38,11 +38,11 @@ pipeline {
environment { environment {
CCACHE_BASEDIR = "${env.WORKSPACE}" CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'debug' QGC_CONFIG = 'debug'
QMAKE_VER = "5.9.2/gcc_64/bin/qmake" QMAKE_VER = "5.11.0/gcc_64/bin/qmake"
} }
agent { agent {
docker { docker {
image 'mavlink/qgc-build-linux:2018-04-14' image 'mavlink/qgc-build-linux:2018-06-07'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
...@@ -67,11 +67,11 @@ pipeline { ...@@ -67,11 +67,11 @@ pipeline {
environment { environment {
CCACHE_BASEDIR = "${env.WORKSPACE}" CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'release' QGC_CONFIG = 'release'
QMAKE_VER = "5.9.2/gcc_64/bin/qmake" QMAKE_VER = "5.11.0/gcc_64/bin/qmake"
} }
agent { agent {
docker { docker {
image 'mavlink/qgc-build-linux:2018-04-14' image 'mavlink/qgc-build-linux:2018-06-07'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
...@@ -101,7 +101,7 @@ pipeline { ...@@ -101,7 +101,7 @@ pipeline {
environment { environment {
CCACHE_BASEDIR = "${env.WORKSPACE}" CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'debug' QGC_CONFIG = 'debug'
QMAKE_VER = "5.9.3/clang_64/bin/qmake" QMAKE_VER = "5.11.0/clang_64/bin/qmake"
} }
steps { steps {
sh 'export' sh 'export'
...@@ -129,7 +129,7 @@ pipeline { ...@@ -129,7 +129,7 @@ pipeline {
environment { environment {
CCACHE_BASEDIR = "${env.WORKSPACE}" CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'installer' QGC_CONFIG = 'installer'
QMAKE_VER = "5.9.3/clang_64/bin/qmake" QMAKE_VER = "5.11.0/clang_64/bin/qmake"
} }
steps { steps {
sh 'export' sh 'export'
...@@ -150,6 +150,7 @@ pipeline { ...@@ -150,6 +150,7 @@ pipeline {
} }
} }
} }
} // parallel } // parallel
} // stage('build') } // stage('build')
} // stages } // stages
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment