From 21fc37121d6f01bd04ce3294a14b14b6bca9b6e9 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Tue, 24 Nov 2020 17:11:00 +0100 Subject: [PATCH] CI: add DD4HEP_USE_EDM4HEP, default OFF, ON for dev --- .github/scripts/compile_and_test.sh | 1 + .github/workflows/linux.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/compile_and_test.sh b/.github/scripts/compile_and_test.sh index 06d267c31..186fe70eb 100755 --- a/.github/scripts/compile_and_test.sh +++ b/.github/scripts/compile_and_test.sh @@ -14,6 +14,7 @@ cmake -GNinja \ -DDD4HEP_USE_GEANT4=ON \ -DBoost_NO_BOOST_CMAKE=ON \ -DDD4HEP_USE_LCIO=ON \ + -DDD4HEP_USE_EDM4HEP=${EDM4HEP:-OFF} \ -DDD4HEP_USE_TBB=${TBB} \ -DDD4HEP_USE_HEPMC3=${HEPMC3:-OFF} \ -DBUILD_TESTING=ON \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b569d10c6..9aaa0de16 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -153,6 +153,7 @@ jobs: STANDARD: 17 TBB: OFF HEPMC3: ON + EDM4HEP: ON steps: - uses: actions/checkout@v2 - name: Install CVMFS @@ -171,7 +172,7 @@ jobs: - name: Start container run: | ls - docker run -it --name CI_container -v /home/runner/work/DD4hep/DD4hep:/Package -e VIEW=${{ matrix.LCG }} -e SHARED=${SHARED} -e STANDARD=${STANDARD} -e TBB=${TBB} -e HEPMC3=${HEPMC3} -v /cvmfs/sft.cern.ch:/cvmfs/sft.cern.ch -v /cvmfs/geant4.cern.ch:/cvmfs/geant4.cern.ch -v /cvmfs/sft-nightlies.cern.ch:/cvmfs/sft-nightlies.cern.ch -d ghcr.io/aidasoft/centos7:latest /bin/bash + docker run -it --name CI_container -v /home/runner/work/DD4hep/DD4hep:/Package -e VIEW=${{ matrix.LCG }} -e SHARED=${SHARED} -e STANDARD=${STANDARD} -e TBB=${TBB} -e HEPMC3=${HEPMC3} -e EDM4HEP=${EDM4HEP} -v /cvmfs/sft.cern.ch:/cvmfs/sft.cern.ch -v /cvmfs/geant4.cern.ch:/cvmfs/geant4.cern.ch -v /cvmfs/sft-nightlies.cern.ch:/cvmfs/sft-nightlies.cern.ch -d ghcr.io/aidasoft/centos7:latest /bin/bash - name: Compile and test run: | docker exec CI_container /bin/bash -c "./Package/.github/scripts/compile_and_test.sh" -- GitLab