From 0be1ed916f22cad29ff81a63a72978f28bfc7471 Mon Sep 17 00:00:00 2001 From: Joerg Koenig Date: Sat, 11 May 2019 23:13:19 +0200 Subject: Updated Build env Change-Id: I8d13d08b849ae2d1a7fb9095df776360ad55eff0 --- Jenkinsfile | 4 ++-- buildqt32.bat | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e846baf..054f315 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ def REPO = 'ssh://gerrit1.techsat.local:29418/external/Qt' stage('Build') { parallel linux: { - node('linux') { + node('bslpv02-centos6-64') { deleteDir() checkout([$class: 'GitSCM', branches: [[name: 'features/newbuild']], @@ -19,7 +19,7 @@ stage('Build') { } }, windows: { - node('windows') { + node('bslp05-win10-64') { deleteDir() checkout([$class: 'GitSCM', branches: [[name: 'features/newbuild']], diff --git a/buildqt32.bat b/buildqt32.bat index 4fcc5d3..d7d3c97 100755 --- a/buildqt32.bat +++ b/buildqt32.bat @@ -33,8 +33,6 @@ rem 32 - Bit SET INST_ARCH=x86-msvc call %SDKDIR%setvcvars.bat 2019 x86 -goto Qt - rem Build OpenSSL cd %BASEDIR%\%OPENSSL% call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl/%INSTARCH% @@ -50,7 +48,6 @@ call nmake -f ms\ntdll.mak install cd %BASEDIR% rem QT -:Qt if not exist "%QT_SOURCE_ARCHIVE%" wget.exe -c "%DL_URL%" if exist %SRC_DIR% ( -- cgit v0.12