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

.gitlab-ci.yml

@@ -79,7 +79,6 @@ variables:
 
 
 .geomodel-build-template: &geomodel-job
-  stage: step-A
   script:
     - echo "PWD; LS"
     - pwd; ls
@@ -143,10 +142,12 @@ mac-soqt:
 mac-geomodel-base:
   <<: *macos-job
   <<: *geomodel-job
+  stage: step-A
 
 mac-geomodel-visualization:
   <<: *macos-job
   <<: *geomodel-job
+  stage: step-C
   needs: ["mac-coin", "mac-soqt"]
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
@@ -167,12 +168,12 @@ ubuntu-soqt:
 ubuntu-geomodel-base:
   <<: *ubuntu-job
   <<: *geomodel-job
+  stage: step-A
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
     CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
 
 
-
 # NOTE
 # 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,
@@ -188,6 +189,7 @@ ubuntu-geomodeL-visualization:
   <<: *ubuntu-job
   <<: *geomodel-job
   needs: ["ubuntu-coin", "ubuntu-soqt"]
+  stage: step-C
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
     CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE