From 69de1d8cafc4db8ceaac57f10ef99d1be8bcdda3 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 2 Nov 2020 15:59:56 +0100
Subject: [PATCH] [ci] Bump tested Qt and Conan version.
---
scripts/cmake/ConanSetup.cmake | 2 +-
web/data/versions.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 534bc04ac73..1ec95929224 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -3,7 +3,7 @@ if(NOT OGS_USE_CONAN)
endif()
string(TOLOWER ${OGS_USE_CONAN} OGS_USE_CONAN_lower)
if(OGS_USE_CONAN_lower STREQUAL "auto" AND POETRY)
- execute_process(COMMAND ${CMD_COMMAND} poetry add conan=${ogs.minimum_version.conan})
+ execute_process(COMMAND ${CMD_COMMAND} poetry add conan)
find_program(CONAN_CMD conan HINTS ${LOCAL_VIRTUALENV_BIN_DIRS}
REQUIRED NO_DEFAULT_PATH
)
diff --git a/web/data/versions.json b/web/data/versions.json
index f72dc4a309a..9542c740be3 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -24,7 +24,7 @@
"tested_version": {
"vtk": "8.2.0",
"qt": {
- "linux": "5.14.1",
+ "linux": "5.14.2",
"win": "5.13.2"
},
"ubuntu": "20.04"
--
GitLab