Skip to content
Snippets Groups Projects
Commit 0c47b706 authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny:
Browse files

Merge branch 'master-ci' of ssh://gitlab.cern.ch:7999/GeoModelDev/GeoModel into master-ci

parents de3b08de fbb0ea8f
Branches
No related tags found
1 merge request!2CI: set Ubuntu and macOS pipelines for the new monorepo
...@@ -79,7 +79,6 @@ variables: ...@@ -79,7 +79,6 @@ variables:
.geomodel-build-template: &geomodel-job .geomodel-build-template: &geomodel-job
stage: step-A
script: script:
- echo "PWD; LS" - echo "PWD; LS"
- pwd; ls - pwd; ls
...@@ -143,10 +142,12 @@ mac-soqt: ...@@ -143,10 +142,12 @@ mac-soqt:
mac-geomodel-base: mac-geomodel-base:
<<: *macos-job <<: *macos-job
<<: *geomodel-job <<: *geomodel-job
stage: step-A
mac-geomodel-visualization: mac-geomodel-visualization:
<<: *macos-job <<: *macos-job
<<: *geomodel-job <<: *geomodel-job
stage: step-C
needs: ["mac-coin", "mac-soqt"] needs: ["mac-coin", "mac-soqt"]
variables: variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS} CMAKE_ARGS: ${CMAKE_BASE_ARGS}
...@@ -167,12 +168,12 @@ ubuntu-soqt: ...@@ -167,12 +168,12 @@ ubuntu-soqt:
ubuntu-geomodel-base: ubuntu-geomodel-base:
<<: *ubuntu-job <<: *ubuntu-job
<<: *geomodel-job <<: *geomodel-job
stage: step-A
variables: variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS} CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
# NOTE # NOTE
# The Ubuntu package 'nlohmann-json-dev' is version 2.x, too old for us. # The Ubuntu package 'nlohmann-json-dev' is version 2.x, too old for us.
# Thus, we now build nlohmann_json as part of the build, # Thus, we now build nlohmann_json as part of the build,
...@@ -188,6 +189,7 @@ ubuntu-geomodeL-visualization: ...@@ -188,6 +189,7 @@ ubuntu-geomodeL-visualization:
<<: *ubuntu-job <<: *ubuntu-job
<<: *geomodel-job <<: *geomodel-job
needs: ["ubuntu-coin", "ubuntu-soqt"] needs: ["ubuntu-coin", "ubuntu-soqt"]
stage: step-C
variables: variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS} CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment