From fc32f9715c674357bd5ce0201dcb5f9b60046ecf Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 15 Oct 2018 21:46:09 +0200
Subject: [PATCH] [Jenkins] Use Jenkins master for 'any'-jobs.
These jobs running on envinf1 currently fail.
---
Jenkinsfile | 4 ++--
scripts/cmake/ConanSetup.cmake | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 61ef32cf9ee..ae580b383db 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
stages {
// *************************** Git Check **********************************
stage('Git Check') {
- agent any
+ agent { label "master"}
steps {
sh "git config core.whitespace -blank-at-eof"
sh "git diff --check `git merge-base origin/master HEAD` HEAD -- . ':!*.md' ':!*.pandoc'"
@@ -509,7 +509,7 @@ pipeline {
beforeAgent true
expression { return stage_required.data }
}
- agent any
+ agent { label "master"}
steps {
script {
dir('ogs') { checkout scm }
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 1a47200751d..c0b5fa2eba6 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -59,14 +59,10 @@ if(OGS_USE_LIS)
endif()
if(OGS_BUILD_GUI)
- set(QT_VERSION 5.11.0)
- if(MSVC)
- set(QT_VERSION 5.11.2)
- endif()
set(CONAN_REQUIRES ${CONAN_REQUIRES}
Shapelib/1.3.0@bilke/stable
libgeotiff/1.4.2@bilke/stable
- Qt/${QT_VERSION}@bilke/stable
+ Qt/5.11.2@bilke/stable
)
set(CONAN_OPTIONS ${CONAN_OPTIONS}
VTK:minimal=False
--
GitLab