summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-24 12:56:26 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-24 12:56:26 (GMT)
commit39a1d4ac90160da7cdd8e21e1168bd87bc59361e (patch)
treeead7db70c75e06f5d64c90cc800fd41b620624b7
parent0f6b4551053d467b69cdb77e63bcb369efcc560d (diff)
downloadQt-39a1d4ac90160da7cdd8e21e1168bd87bc59361e.zip
Qt-39a1d4ac90160da7cdd8e21e1168bd87bc59361e.tar.gz
Qt-39a1d4ac90160da7cdd8e21e1168bd87bc59361e.tar.bz2
Removed try ... catch in mingw part of jenkins scriptrefs/changes/70/11070/1
Change-Id: Ifc2938dd76847ce7d5524c1ff52e4f4f80de3247
-rw-r--r--Jenkinsfile17
1 files changed, 7 insertions, 10 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 67cd46b..49c1f8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,7 +46,6 @@ stage('Build') {
},
windows: {
node('bslp05-win10-64') {
- try {
deleteDir()
checkout([$class: 'GitSCM',
branches: [[name: BRANCH]],
@@ -108,16 +107,14 @@ stage('Build') {
buildqt64.bat
'''
}
+ stage ("Cleanup") {
+ sh '''#!/bin/bash
+ set -x
+ #rm -Rf /c/tmp/qt
+ #rm -Rf $(cygpath $WORKSPACE)/openssl-1.0.2r
+ '''
+ }
stash name: "qtwin", includes: "qt-*-msvc.zip,*qt-*-x86-mingw64.tgz,qtcreator-*-x86-mingw64.zip"
- } catch (e) {
- echo 'Windows build failed'
- } finally {
- sh '''
- export PATH=/c/msys/x86/usr/bin
- rm -Rf $(cygpath $WORKSPACE)/openssl-1.0.2r
- exit 1
- '''
- }
}
}
}