Merge branch 'ci-fix-gui' into 'master'

[ci] Fix gui master

See merge request ogs/ogs!3199

container-maker @ 4adc2e18

-Subproject commit a24d8405cdbb64e15d78a3f21f64c8fc84b82f76
+Subproject commit 4adc2e1845d38d05c1eefaf422ba431d90dc6002

xdmfdiff @ b2928dd7

-Subproject commit 428760e717acef51fdedcc2bf3e56474c1b971ef
+Subproject commit b2928dd75bbea23640438648b8a0170dc1ed752d

scripts/ci/jobs/build-gui-mac.yml

@@ -12,8 +12,7 @@ build gui mac:
     BUILD_DIR: "build-gui-mac"
     BUILD_CTEST: "false"
     CMAKE_ARGS: >-
-      -DOGS_USE_CONAN=OFF
-      -DOGS_USE_PCH=OFF
+      -DOGS_USE_CONAN=auto
       -DOGS_BUILD_GUI=ON
       -DOGS_BUILD_UTILS=ON
-      -DOGS_USE_NETCDF=ON
+      -DOGS_USE_NETCDF=OFF

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
     )

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"