From 5f054649f8dce911829876d3a06e9ecd09f09fd8 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Wed, 10 May 2017 22:20:27 +0200
Subject: [PATCH] Add Geant4 10.3.1 to CI
---
.dd4hep-ci.d/init_x86_64.sh | 6 ++++-
.gitlab-ci.yml | 46 +++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/.dd4hep-ci.d/init_x86_64.sh b/.dd4hep-ci.d/init_x86_64.sh
index 52f40f557..05ba8ff11 100644
--- a/.dd4hep-ci.d/init_x86_64.sh
+++ b/.dd4hep-ci.d/init_x86_64.sh
@@ -101,8 +101,12 @@ export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
#--------------------------------------------------------------------------------
# Geant4
#--------------------------------------------------------------------------------
+#Determine which Geant4 version to use
+if [ -z ${GEANT4_VERSION} ]; then
+GEANT4_VERSION="10.02.p03"
+fi
-export G4INSTALL=${CLICREPO}/software/Geant4/10.02.p03/${BUILD_FLAVOUR}
+export G4INSTALL=${CLICREPO}/software/Geant4/${GEANT4_VERSION}/${BUILD_FLAVOUR}
export G4ENV_INIT="${G4INSTALL}/bin/geant4.sh"
export G4SYSTEM="Linux-g++"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c9f766ab..0ec88afcc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,29 @@ slc6-llvm40-Geant10.2:
- ninja install
- ctest --output-on-failure
+slc6-ggc7-Geant10.3:
+ tags:
+ - docker
+ image: clicdp/slc6-base
+ script:
+ - export COMPILER_TYPE="gcc"
+ - export GEANT4_VERSION="10.03.p01"
+ - source .dd4hep-ci.d/init_x86_64.sh
+ - mkdir build
+ - cd build
+ - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.3.1 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+ - ninja
+ - ninja install
+ - . ../bin/thisdd4hep.sh
+ - ctest --output-on-failure -j4
+ - cd ../examples/
+ - mkdir build
+ - cd build
+ - cmake -GNinja ..
+ - ninja
+ - ninja install
+ - ctest --output-on-failure
+
slc6-gcc7-Geant10.2-XERCESC:
tags:
- docker
@@ -109,6 +132,29 @@ centos7-llvm40-Geant10.2:
- ninja install
- ctest --output-on-failure
+centos7-llvm40-Geant10.3-XERCESC:
+ tags:
+ - docker
+ image: clicdp/slc6-base
+ script:
+ - export COMPILER_TYPE="llvm"
+ - export GEANT4_VERSION="10.03.p01"
+ - source .dd4hep-ci.d/init_x86_64.sh
+ - mkdir build
+ - cd build
+ - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.3.1 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
+ - ninja
+ - ninja install
+ - . ../bin/thisdd4hep.sh
+ - ctest --output-on-failure -j4
+ - cd ../examples/
+ - mkdir build
+ - cd build
+ - cmake -GNinja ..
+ - ninja
+ - ninja install
+ - ctest --output-on-failure
+
mac1012-clang80:
tags:
- mac
--
GitLab