From 5e07999d90b7e81fff3122cd322e369676b6417f Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Wed, 23 Oct 2019 12:56:33 +0200
Subject: [PATCH] CI: only compile for static libraries, no tests
---
.dd4hep-ci.d/compile_and_test.sh | 11 +++++++++--
.travis.yml | 4 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.dd4hep-ci.d/compile_and_test.sh b/.dd4hep-ci.d/compile_and_test.sh
index 53dd61628..bdc4b5f7f 100755
--- a/.dd4hep-ci.d/compile_and_test.sh
+++ b/.dd4hep-ci.d/compile_and_test.sh
@@ -13,8 +13,15 @@ cmake -GNinja -DDD4HEP_USE_GEANT4=ON \
-DDD4HEP_DEBUG_CMAKE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -Werror" \
- -DCMAKE_CXX_STANDARD=${STANDARD} ${CMAKE_ARGS} .. && \
-ninja && \
+ -DBUILD_SHARED_LIBS=${SHARED} \
+ -DCMAKE_CXX_STANDARD=${STANDARD} .. && \
+ ninja
+
+if [[ "${SHARED}" == "OFF" ]];
+then
+ exit 0;
+fi
+
ninja install && \
. ../bin/thisdd4hep.sh && \
ctest --output-on-failure -j4 && \
diff --git a/.travis.yml b/.travis.yml
index 30c49d796..57ccebb27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ language: cpp
env:
- COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc9; PYTHON_CHECK="no"
- - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no"; CMAKE_ARGS="-DBUILD_SHARED_LIBS=OFF"
+ - COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no"; SHARED=OFF
- COMPILER=gcc; LCG_RELEASE=LCG_96bpython3; STANDARD=17; COMPILER_VERSION=gcc8; PYTHON_CHECK="no"
- COMPILER=clang; LCG_RELEASE=LCG_96b; STANDARD=17; COMPILER_VERSION=clang8; PYTHON_CHECK="no"
- COMPILER=gcc; LCG_RELEASE=LCG_96b; STANDARD=14; COMPILER_VERSION=gcc62; PYTHON_CHECK="no"
@@ -59,7 +59,7 @@ install:
# command to run tests
script:
- - 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} -e CMAKE_ARGS=${CMAKE_ARGS} ${CVMFS_REPOS} -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} -e SHARED=${SHARED:-ON} ${CVMFS_REPOS} -d clicdp/cc7-lcg /bin/bash
- if [[ "$PYTHON_CHECK" == "yes" ]];
then docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/runPythonChecks.sh";
else docker exec -ti CI_container /bin/bash -c "./DD4hep/.dd4hep-ci.d/compile_and_test.sh";
--
GitLab