summaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile75
1 files changed, 46 insertions, 29 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 054f315..5198b5d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@ def REPO = 'ssh://gerrit1.techsat.local:29418/external/Qt'
stage('Build') {
parallel linux: {
- node('bslpv02-centos6-64') {
+ node('bslp02-centos6-64') {
deleteDir()
checkout([$class: 'GitSCM',
branches: [[name: 'features/newbuild']],
@@ -11,38 +11,55 @@ stage('Build') {
submoduleCfg: [],
userRemoteConfigs: [[url: REPO]]])
sh '''#!/bin/bash
- source /opt/centos/devtoolset-1.1/enable
- gcc -v
- make
- '''
- archiveArtifacts artifacts: 'qt-*-x86-linux64.zip'
+ GCC_PATH=/master/DEV-Tools/gcc-suite/1.2.0-125/x86-linux64/gcc-8.0.1 make
+ '''
+ archiveArtifacts artifacts: 'qt-*-x86-linux64.tgz'
}
},
windows: {
node('bslp05-win10-64') {
- deleteDir()
- checkout([$class: 'GitSCM',
- branches: [[name: 'features/newbuild']],
- doGenerateSubmoduleConfigurations: false,
- extensions: [],
- submoduleCfg: [],
- userRemoteConfigs: [[url: REPO]]])
- bat '''@echo off
- net use K: \\\\dfs2.techsat.net\\dev-tools /yes > NUL 2>&1
- set SDKDIR=K:\\WinSDK\\VS2019BT\\
- set PERLDIR=K:\\perl\\x86_64-msvc\\
- buildqt32.bat
- '''
- bat '''@echo off
- net use K: \\\\dfs2.techsat.net\\dev-tools /yes > NUL 2>&1
- set SDKDIR=K:\\WinSDK\\VS2019BT\\
- set PERLDIR=K:\\perl\\x86_64-msvc\\
- buildqt64.bat
- '''
- bat '''@echo off
- net use K: /delete /yes >NUL 2>&1
- '''
- archiveArtifacts artifacts: 'qt-*-msvc.zip'
+ try {
+ deleteDir()
+ checkout([$class: 'GitSCM',
+ branches: [[name: 'features/newbuild']],
+ doGenerateSubmoduleConfigurations: false,
+ extensions: [],
+ submoduleCfg: [],
+ userRemoteConfigs: [[url: REPO]]])
+
+ bat '''@echo off
+ net use K: \\\\dfs2.techsat.net\\dev-tools /yes
+ set SDKDIR=K:\\WinSDK\\VS2019BT\\
+ set PERLDIR=K:\\perl\\x86_64-msvc\\
+ set NASMDIR=K:\\nasm\\2.12.01_32\\
+ set MSYSDIR=K:\\msys\\x86\\
+ set PATH=%PATH%;K:\\Python\\2.7\\x86-windows\\
+ buildqt32.bat
+ '''
+
+ bat '''@echo off
+ net use K: \\\\dfs2.techsat.net\\dev-tools /yes
+ set SDKDIR=K:\\WinSDK\\VS2019BT\\
+ set PERLDIR=K:\\perl\\x86_64-msvc\\
+ set NASMDIR=K:\\nasm\\2.12.01_64
+ set MSYSDIR=K:\\msys\\x86\\
+ set PATH=%PATH%;K:\\Python\\2.7\\x86-windows\\
+ buildqt64.bat
+ '''
+ archiveArtifacts artifacts: '*-msvc.zip'
+
+ } catch (e) {
+ echo 'Windows build failed'
+ } finally {
+ bat '''
+ set PATH=K:\\msys\\x86\\usr\\bin;%PATH%
+ cd %WORKSPACE%\\openssl-1.0.2r
+ sh.exe -c "rm -f NUL"
+ cd %WORKSPACE%
+ net use K: /delete /yes
+ '''
+
+ }
}
}
}