diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb41f6b0fd52be97f227cde2074996c2d3d00be5..5883e6bfd4bb4f0b42d8f9a0e10ac9f6ebfd6769 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ slc6-gcc48: - source .gitlab-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.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Debug -DDD4HEP_USE_XERCESC=ON .. + - 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.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Debug .. - ninja - ninja install - . ../bin/thisdd4hep.sh @@ -24,6 +24,7 @@ slc6-gcc48: - rm -rf .git - sshpass -p $CLICTEL_PASS rsync -arv -e ssh --delete . clictel@lxplus:/afs/cern.ch/eng/clic/software/DD4hep/x86_64-slc6-gcc48-dbg + slc6-gcc49: tags: - docker @@ -32,9 +33,9 @@ slc6-gcc49: - export GCC_VERSION="4.9.3" - export BUILD_TYPE="opt" - source .gitlab-ci.d/init_x86_64.sh - - mkdir build + - 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.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Debug -DDD4HEP_USE_XERCESC=ON .. + - 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.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Debug .. - ninja - ninja install - . ../bin/thisdd4hep.sh @@ -50,6 +51,31 @@ slc6-gcc49: - rm -rf .git - sshpass -p $CLICTEL_PASS rsync -arv -e ssh --delete . clictel@lxplus:/afs/cern.ch/eng/clic/software/DD4hep/x86_64-slc6-gcc49-dbg + + +slc6-gcc49-XERCESC: + tags: + - docker + image: clicdp/slc6-base + script: + - export GCC_VERSION="4.9.3" + - export BUILD_TYPE="opt" + - source .gitlab-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.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Debug -DDD4HEP_USE_XERCESC=ON .. + - 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 + centos7-gcc49: tags: - docker @@ -60,7 +86,7 @@ centos7-gcc49: - source .gitlab-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.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Debug -DDD4HEP_USE_XERCESC=ON .. + - 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.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Debug .. - ninja - ninja install - . ../bin/thisdd4hep.sh