summaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2019-12-06 13:31:40 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2019-12-06 13:31:40 (GMT)
commit36d9a434d25db3c1c9d988c9f22b476b30271241 (patch)
tree59f645fd941efb7d2e0bcff5434d6eb1fb045d2f /Jenkinsfile
parentdfc9c008e380e683d3d1573dfc8adcfceaf74602 (diff)
downloadQt-36d9a434d25db3c1c9d988c9f22b476b30271241.zip
Qt-36d9a434d25db3c1c9d988c9f22b476b30271241.tar.gz
Qt-36d9a434d25db3c1c9d988c9f22b476b30271241.tar.bz2
Fixed build for Qt 5.13.2refs/changes/56/9456/1
Change-Id: Iad565bb7ea60fa790f99886269f94e2253056545
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 49fd42d..152bf8e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -87,7 +87,7 @@ stage('Build') {
echo 'Windows build failed'
} finally {
sh '''
- export PATH=/c/dev-tools/msys/x86/usr/bin
+ export PATH=/c/msys/x86/usr/bin
rm -Rf $(cygpath $WORKSPACE)/openssl-1.0.2r
'''
}
@@ -98,7 +98,7 @@ stage ("Post processing") {
node('bslp02-centos6-64') {
unstash name: 'qtwin'
sh '''
- QT_VER=5.13.1
+ QT_VER=5.13.2
#
# cleanup temporary destination folder for final distribution ...
# unpack Linux archives ...
@@ -126,7 +126,6 @@ stage ("Post processing") {
echo "TargetSpec=x-win32-g++" >> $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/qt.conf
#
# finally create the whole archive ...
- cd $WORKSPACE/INST && tar -zcf $WORKSPACE/qt-$QT_VER-$BUILD_NUMBER-bins_64.tgz ./
rm -Rf $WORKSPACE/INST
'''
archiveArtifacts artifacts: '*.tgz, *.zip'