diff --git a/.dd4hep-ci.d/compile_and_test.sh b/.dd4hep-ci.d/compile_and_test.sh
index ddfa81152ed8e7a08dcc3b1ab0b5138eba5d9652..c847be90cc941a2d839cba4bf08755433e14d0d5 100755
--- a/.dd4hep-ci.d/compile_and_test.sh
+++ b/.dd4hep-ci.d/compile_and_test.sh
@@ -5,7 +5,7 @@ source /DD4hep/.dd4hep-ci.d/init_x86_64.sh
cd /DD4hep
mkdir build
cd build
-cmake -GNinja -DDD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=ON -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -Werror" -DCMAKE_CXX_STANDARD=17 .. && \
+cmake -GNinja -DDD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -DDD4HEP_USE_LCIO=ON -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -Werror" -DCMAKE_CXX_STANDARD=${STANDARD} .. && \
ninja && \
ninja install && \
. ../bin/thisdd4hep.sh && \
diff --git a/.dd4hep-ci.d/init_x86_64.sh b/.dd4hep-ci.d/init_x86_64.sh
index 1f21c11e3a63680e0f712aea767666dba2a5fd43..a9131a49cd6fc1c33a0d302ca3c08de8f4c46d88 100644
--- a/.dd4hep-ci.d/init_x86_64.sh
+++ b/.dd4hep-ci.d/init_x86_64.sh
@@ -50,91 +50,15 @@ fi
LCGREPO=/cvmfs/sft.cern.ch/lcg/releases/${LCG_RELEASE}
BUILD_FLAVOUR=x86_64-${OS}-${COMPILER_VERSION}-${BUILD_TYPE}
-export LD_LIBRARY_PATH=/cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}/${BUILD_FLAVOUR}/lib64:/cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}/${BUILD_FLAVOUR}/lib:$LD_LIBRARY_PATH
-
-#--------------------------------------------------------------------------------
-# Compiler
-#--------------------------------------------------------------------------------
-
-if [[ ${COMPILER_TYPE} == "gcc" ]]; then
- source /cvmfs/sft.cern.ch/lcg/releases/gcc/8.2.0-3fa06/x86_64-${OS}/setup.sh
-fi
-if [[ ${COMPILER_TYPE} == "clang" ]]; then
- source /cvmfs/sft.cern.ch/lcg/releases/clang/8.0.0-ed577/x86_64-${OS}/setup.sh
-fi
-
-#--------------------------------------------------------------------------------
-# CMake
-#--------------------------------------------------------------------------------
-
-export CMAKE_HOME=${LCGREPO}/CMake/3.14.3/${BUILD_FLAVOUR}
-export PATH=${CMAKE_HOME}/bin:$PATH
-
-#--------------------------------------------------------------------------------
-# Python
-#--------------------------------------------------------------------------------
-if [[ $LCG_RELEASE =~ "python3" ]]; then
- export PYTHONDIR=${LCGREPO}/Python/3.6.5/${BUILD_FLAVOUR}
-else
- export PYTHONDIR=${LCGREPO}/Python/2.7.16/${BUILD_FLAVOUR}
-fi
-export PATH=${PYTHONDIR}/bin:$PATH
-export LD_LIBRARY_PATH=${PYTHONDIR}/lib:${LD_LIBRARY_PATH}
-
-#--------------------------------------------------------------------------------
-# ROOT
-#--------------------------------------------------------------------------------
-
-export ROOTSYS=${LCGREPO}/ROOT/6.18.00/${BUILD_FLAVOUR}
-export ROOT_ROOT=$ROOTSYS
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# XercesC
-#--------------------------------------------------------------------------------
-
-export XercesC_ROOT=${LCGREPO}/XercesC/3.1.3/${BUILD_FLAVOUR}
-export PATH="$XercesC_ROOT/bin:$PATH"
-export LD_LIBRARY_PATH="$XercesC_ROOT/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Geant4
-#--------------------------------------------------------------------------------
-
-export Geant4_ROOT=${LCGREPO}/Geant4/10.05.p01/${BUILD_FLAVOUR}
-export G4LIB=$Geant4_ROOT/lib/Geant4-10.5.1/
-export G4ENV_INIT="${Geant4_ROOT}/bin/geant4.sh"
-export G4SYSTEM="Linux-g++"
+echo /cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}/${BUILD_FLAVOUR}/setup.sh
+source /cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}/${BUILD_FLAVOUR}/setup.sh
#--------------------------------------------------------------------------------
# LCIO
#--------------------------------------------------------------------------------
export LCIO=/cvmfs/clicdp.cern.ch/software/LCIO/2.12.1/x86_64-${OS}-${COMPILER_VERSION}-LCG_96
+export LCIO_ROOT=${LCIO}
export PYTHONPATH=${LCIO}/python
export PATH=${LCIO}/bin:$PATH
export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-
-
-#--------------------------------------------------------------------------------
-# Boost
-#--------------------------------------------------------------------------------
-
-export BOOST_ROOT=${LCGREPO}/Boost/1.70.0/${BUILD_FLAVOUR}
-export LD_LIBRARY_PATH="${BOOST_ROOT}/lib:$LD_LIBRARY_PATH"
-
-#--------------------------------------------------------------------------------
-# Ninja
-#--------------------------------------------------------------------------------
-
-export Ninja_HOME=${LCGREPO}/ninja/1.9.0/${BUILD_FLAVOUR}
-export PATH="$Ninja_HOME/bin:$PATH"
-
-#--------------------------------------------------------------------------------
-# Doxygen
-#--------------------------------------------------------------------------------
-
-export Doxygen_HOME=${LCGREPO}/doxygen/1.8.15/${BUILD_FLAVOUR}
-export PATH="$Doxygen_HOME/bin:$PATH"
diff --git a/.travis.yml b/.travis.yml
index 51b62fb98b551e1982617d749aadc40a6853cc05..7c94fcf3b793be8fe8a471877bbd9ae3764b9c71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,9 @@ language: cpp
env:
matrix:
- - COMPILER=gcc
- - COMPILER=clang
+ - COMPILER=gcc; LCG_RELEASE=LCG_96; STANDARD=17; COMPILER_VERSION=gcc8
+ - COMPILER=clang; LCG_RELEASE=LCG_96; STANDARD=17; COMPILER_VERSION=clang8
+ - COMPILER=gcc; LCG_RELEASE=LCG_96; STANDARD=14; COMPILER_VERSION=gcc62
before_install:
- wget --no-check-certificate https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb
@@ -42,7 +43,7 @@ install:
# command to run tests
script:
- - docker run -ti --name CI_container -v $PKGDIR:/DD4hep -e COMPILER_TYPE=$COMPILER -v /cvmfs/sft.cern.ch:/cvmfs/sft.cern.ch -v /cvmfs/geant4.cern.ch:/cvmfs/geant4.cern.ch -v /cvmfs/clicdp.cern.ch:/cvmfs/clicdp.cern.ch -d clicdp/cc7-lcg /bin/bash
+ - docker run -ti --name CI_container -v $PKGDIR:/DD4hep -e COMPILER_TYPE=$COMPILER -e LCG_RELEASE=${LCG_RELEASE} -e STANDARD=${STANDARD} -e COMPILER_VERSION=${COMPILER_VERSION} -v /cvmfs/sft.cern.ch:/cvmfs/sft.cern.ch -v /cvmfs/geant4.cern.ch:/cvmfs/geant4.cern.ch -v /cvmfs/clicdp.cern.ch:/cvmfs/clicdp.cern.ch -d clicdp/cc7-lcg /bin/bash
- docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/compile_and_test.sh"
- if [[ "${TRAVIS_EVENT_TYPE}" != "cron" && "${TRAVIS_EVENT_TYPE}" != "pull_request" && "${COMPILER}" == "gcc" && "${TRAVIS_REPO_SLUG%/*}" == "AIDASoft" ]];
then curl -X POST -F token=$GITLAB_TOKEN -F ref=master https://gitlab.cern.ch/api/v4/projects/7828/trigger/pipeline;