diff --git a/Jenkinsfile b/Jenkinsfile index 61ef32cf9ee1fea695a19545ff2e2b5417d7f1e0..ae580b383db8156d2b0c5608d58ff398649ce955 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 1a47200751dc94dea6f39898428289a211c45c59..c0b5fa2eba65368d2905da51ffb025ae4c968002 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