Skip to content
Snippets Groups Projects
Commit 5534e717 authored by Marilena Bandieramonte's avatar Marilena Bandieramonte
Browse files

CI: update to use tag 1.1 of the ubuntu-geant4 docker image that does not have...

CI: update to use tag 1.1 of the ubuntu-geant4 docker image that does not have CLHEP installed in the system
parent b1a5dba9
No related branches found
No related tags found
1 merge request!3Remove clhep dependency
Pipeline #1710256 failed
stages: stages:
- deps-geomodelcore - deps-geomodelcore
# - deps-CLHEP
- deps-xerces-c - deps-xerces-c
- deps-Geant4 - deps-Geant4
- build - build
...@@ -21,7 +20,7 @@ variables: ...@@ -21,7 +20,7 @@ variables:
- export PATH="/usr/local/opt/qt/bin:$PATH" # to make Qt5 discoverable by CMake - export PATH="/usr/local/opt/qt/bin:$PATH" # to make Qt5 discoverable by CMake
.ubuntu-template-job: &ubuntu-job .ubuntu-template-job: &ubuntu-job
image: gitlab-registry.cern.ch/mbandier/geant4-ubuntu/base-image:latest image: gitlab-registry.cern.ch/mbandier/geant4-ubuntu/base-image:1.1
tags: tags:
- docker - docker
before_script: before_script:
...@@ -43,25 +42,6 @@ variables: ...@@ -43,25 +42,6 @@ variables:
paths: paths:
- install - install
#.CLHEP-build-template-job: &CLHEP-job
# stage: deps-CLHEP
# 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
# - cd ../
# - mkdir CLHEP-build
# - cd CLHEP-build
# - cmake ${CMAKE_ARGS} ../CLHEP
# - make -j32
# - make install
# artifacts:
# paths:
# - install
.xerces-c-build-template-job: &xerces-c-job .xerces-c-build-template-job: &xerces-c-job
stage: deps-xerces-c stage: deps-xerces-c
variables: variables:
...@@ -122,10 +102,6 @@ geomodelcore-mac: ...@@ -122,10 +102,6 @@ geomodelcore-mac:
<<: *macos-job <<: *macos-job
<<: *geomodelcore-job <<: *geomodelcore-job
#CLHEP-mac:
# <<: *macos-job
# <<: *CLHEP-job
xerces-c-mac: xerces-c-mac:
<<: *macos-job <<: *macos-job
<<: *xerces-c-job <<: *xerces-c-job
...@@ -146,10 +122,6 @@ geomodelcore-ubuntu: ...@@ -146,10 +122,6 @@ geomodelcore-ubuntu:
<<: *ubuntu-job <<: *ubuntu-job
<<: *geomodelcore-job <<: *geomodelcore-job
#CLHEP-ubuntu:
# <<: *ubuntu-job
# <<: *CLHEP-job
#geomodelio-ubuntu: #geomodelio-ubuntu:
# <<: *ubuntu-job # <<: *ubuntu-job
# <<: *geomodelio-job # <<: *geomodelio-job
...@@ -162,7 +134,7 @@ geomodelcore-ubuntu: ...@@ -162,7 +134,7 @@ geomodelcore-ubuntu:
# Geant4-ubuntu: # Geant4-ubuntu:
# <<: *ubuntu-job # <<: *ubuntu-job
# <<: *Geant4-job # <<: *Geant4-job
# needs: ["CLHEP-ubuntu", "xerces-c-ubuntu"] # needs: ["xerces-c-ubuntu"]
geomodelg4-ubuntu: geomodelg4-ubuntu:
<<: *ubuntu-job <<: *ubuntu-job
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment