diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker index e12696ff7cf4ee03d94e34f6b9d3615f43befeb9..3b69e7b92bae8a4c3f22ab170f46f0822128d0db 160000 --- a/ThirdParty/container-maker +++ b/ThirdParty/container-maker @@ -1 +1 @@ -Subproject commit e12696ff7cf4ee03d94e34f6b9d3615f43befeb9 +Subproject commit 3b69e7b92bae8a4c3f22ab170f46f0822128d0db diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml index 67a74b553975cecb8f7d919f621ce683adb37a41..4b53cc9dfa20b5c11d1dce9f5280db44e4a28cb3 100644 --- a/scripts/ci/jobs/build-gui-linux.yml +++ b/scripts/ci/jobs/build-gui-linux.yml @@ -17,10 +17,8 @@ build gui linux: variables: BUILD_DIR: "build-gui-linux" - CONAN_USER_HOME: "$CI_PROJECT_DIR/.conan" CMAKE_ARGS: >- - -DOGS_USE_CONAN=ON - -DOGS_USE_PCH=OFF + -DOGS_USE_CONAN=OFF -DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON -DOGS_USE_NETCDF=ON @@ -31,4 +29,3 @@ build gui linux: cache: paths: - $CCACHE_DIR - - $CONAN_USER_HOME diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml index 8a5565851d4cc22bd4d194bb210563ed13ccdcdb..49491f36ba86711c5673a9610f02b60b10a1ffb1 100644 --- a/scripts/ci/jobs/build_image.yml +++ b/scripts/ci/jobs/build_image.yml @@ -21,7 +21,7 @@ build container images: --tag $CONTAINER_GCC_IMAGE --upload - docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc-gui:master || true - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off - --pm conan --cvode --cppcheck --docs --gcovr --gui + --pm system --cvode --cppcheck --docs --gcovr --gui --tag $CONTAINER_GCC_GUI_IMAGE --upload - docker pull registry.opengeosys.org/ogs/ogs/ogs/clang:master || true - python ThirdParty/container-maker/ogscm/cli.py --build --ogs off