Dependency of GeoModelIO from CLHEP - branch compatible with GeoModelG4

.gitlab-ci.yml

@@ -44,38 +44,38 @@ variables:
     paths:
       - install
 
-.geomodelio-build-template-job: &geomodelio-job
+.CLHEP-build-template-job: &CLHEP-job
   stage: deps-B
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
   script:
     - pwd; ls
-    - git clone https://gitlab.cern.ch/GeoModelDev/GeoModelIO.git
-    - cd GeoModelIO
-    - git checkout master-specialshape-geomodelg4
+    - git clone https://gitlab.cern.ch/CLHEP/CLHEP.git
+    - cd CLHEP
+    - git checkout CLHEP_2_4_1_0
     - cd ../
-    - mkdir geomodelio-build
-    - cd geomodelio-build
-    - cmake ${CMAKE_ARGS} ../GeoModelIO
+    - mkdir CLHEP-build
+    - cd CLHEP-build
+    - cmake ${CMAKE_ARGS} ../CLHEP
     - make -j32
     - make install
   artifacts:
     paths:
       - install
 
-.CLHEP-build-template-job: &CLHEP-job
+.geomodelio-build-template-job: &geomodelio-job
   stage: deps-C
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
   script:
     - pwd; ls
-    - git clone https://gitlab.cern.ch/CLHEP/CLHEP.git
-    - cd CLHEP
-    - git checkout CLHEP_2_4_1_0
+    - git clone https://gitlab.cern.ch/GeoModelDev/GeoModelIO.git
+    - cd GeoModelIO
+    - git checkout master-specialshape-geomodelg4
     - cd ../
-    - mkdir CLHEP-build
-    - cd CLHEP-build
-    - cmake ${CMAKE_ARGS} ../CLHEP
+    - mkdir geomodelio-build
+    - cd geomodelio-build
+    - cmake ${CMAKE_ARGS} ../GeoModelIO
     - make -j32
     - make install
   artifacts:
@@ -121,15 +121,15 @@ geomodelcore-mac:
   <<: *macos-job
   <<: *geomodelcore-job
 
-geomodelio-mac:
-  <<: *macos-job
-  <<: *geomodelio-job
-  needs: ["geomodelcore-mac"]
-
 CLHEP-mac:
   <<: *macos-job
   <<: *CLHEP-job
 
+geomodelio-mac:
+  <<: *macos-job
+  <<: *geomodelio-job
+  needs: ["geomodelcore-mac", "CLHEP-mac"]
+
 Geant4-mac:
   <<: *macos-job
   <<: *Geant4-job
@@ -146,15 +146,15 @@ geomodelcore-ubuntu:
   <<: *ubuntu-job
   <<: *geomodelcore-job
 
-geomodelio-ubuntu:
-  <<: *ubuntu-job
-  <<: *geomodelio-job
-  needs: ["geomodelcore-ubuntu"]
-
 CLHEP-ubuntu:
   <<: *ubuntu-job
   <<: *CLHEP-job
 
+geomodelio-ubuntu:
+  <<: *ubuntu-job
+  <<: *geomodelio-job
+  needs: ["geomodelcore-ubuntu", "CLHEP-ubuntu"]
+
 Geant4-ubuntu:
   <<: *ubuntu-job
   <<: *Geant4-job