diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 039975c1a996c67dcb3539677142ef65ec9e6c6a..15d00a4055e5949d8261b9c2e2e6b5abceb1ae96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,30 +107,30 @@ variables: paths: - install -# temp template -.geomodel-build-template-viz: &geomodel-viz-job - script: - - echo "PWD; LS" # CI debug only - - pwd; ls # CI debug only - - ls dependencies-install - - ls dependencies-install/lib/cmake/ - - ls ../ # CI debug only - - ls ../../ # CI debug only - - cmake --version # CI debug only - - mkdir build - - cd build - - echo "CMAKE_ARGS - ${CMAKE_ARGS}" - - echo "CMAKE_EXTRA_FLAGS - ${CMAKE_EXTRA_FLAGS}" - - cmake ${CMAKE_ARGS} ${CMAKE_EXTRA_FLAGS} .. - # - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../dependencies-install -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE .. - - cmake --build . -- -j2 # using too many threads will cause weird compilation errors on the Ubuntu docker images... - - cmake --build . -- install - - pwd; ls # CI debug only - - ls ../ # CI debug only - - ls ../../ # CI debug only - artifacts: - paths: - - install +# # temp template +# .geomodel-build-template-viz: &geomodel-viz-job +# script: +# - echo "PWD; LS" # CI debug only +# - pwd; ls # CI debug only +# - ls dependencies-install +# - ls dependencies-install/lib/cmake/ +# - ls ../ # CI debug only +# - ls ../../ # CI debug only +# - cmake --version # CI debug only +# - mkdir build +# - cd build +# - echo "CMAKE_ARGS - ${CMAKE_ARGS}" +# - echo "CMAKE_EXTRA_FLAGS - ${CMAKE_EXTRA_FLAGS}" +# - cmake ${CMAKE_ARGS} ${CMAKE_EXTRA_FLAGS} .. +# # - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../dependencies-install -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE .. +# - cmake --build . -- -j2 # using too many threads will cause weird compilation errors on the Ubuntu docker images... +# - cmake --build . -- install +# - pwd; ls # CI debug only +# - ls ../ # CI debug only +# - ls ../../ # CI debug only +# artifacts: +# paths: +# - install @@ -183,7 +183,7 @@ ubuntu-geomodel-base-builtinNlohmannXercesC: ubuntu-geomodeL-visualization-builtinNlohmannXercesC: <<: *ubuntu-job - <<: *geomodel-viz-job + <<: *geomodel-job needs: ["ubuntu-coin", "ubuntu-soqt"] stage: step-C variables: