From a43610d18e071f045a72b83bf83df918b5fbd98d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 5 Jun 2020 10:12:45 +0200
Subject: [PATCH] Revert "[Jenkins] Fix mac-gui job."
This reverts commit 35bf0fc5e11846789ba8149b6dc7b9369f5aadcf.
---
Jenkinsfile | 2 +-
scripts/cmake/ConanSetup.cmake | 2 +-
web/data/versions.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 24cee30af8d..e2f27244ec3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -528,7 +528,7 @@ pipeline {
'-DOGS_CPU_ARCHITECTURE=core2 ' +
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_BUILD_GUI=ON ' +
- '-DOGS_USE_CONAN=ON ' +
+ '-DOGS_USE_CONAN=OFF ' +
'-DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" ' +
'-DOGS_USE_NETCDF=ON '
}
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 95571e18370..029d78430b6 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -68,7 +68,7 @@ if(OGS_BUILD_GUI)
zlib/1.2.11
)
if(UNIX)
- set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.linux}@bincrafters/testing)
+ set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.linux}@bincrafters/stable)
else()
set(CONAN_REQUIRES ${CONAN_REQUIRES} qt/${ogs.tested_version.qt.win}@bincrafters/stable)
endif()
diff --git a/web/data/versions.json b/web/data/versions.json
index 15bba2aaeb6..79563e9cbe9 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -20,7 +20,7 @@
"tested_version": {
"vtk": "8.2.0",
"qt": {
- "linux": "5.14.2",
+ "linux": "5.14.1",
"win": "5.13.2"
}
}
--
GitLab