Verified Commit 7d940296 authored by Lars Bilke's avatar Lars Bilke
Browse files

[ci] Do not use Conan in Linux GUI build.

parent d1fba71f
Subproject commit e12696ff7cf4ee03d94e34f6b9d3615f43befeb9
Subproject commit 3b69e7b92bae8a4c3f22ab170f46f0822128d0db
......@@ -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
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment