From f446cce4c44e8af951bcd9515cc31f384b91fc24 Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Thu, 24 Oct 2024 01:35:54 +0200
Subject: [PATCH] Several changes in athena_ci
- Removed build caching
- Added one interface library to `package_filters.txt` and removed VP1 & JiveXML packages
(to save on build time)
---
athena_ci/athena_build.sh | 25 ++++---------------------
athena_ci/package_filters.txt | 12 +-----------
athena_ci/test_athena.sh | 3 ---
3 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/athena_ci/athena_build.sh b/athena_ci/athena_build.sh
index 5da73e55b..b2e11f574 100755
--- a/athena_ci/athena_build.sh
+++ b/athena_ci/athena_build.sh
@@ -96,10 +96,6 @@ echo "LCG_PLATFORM: ${LCG_PLATFORM}"
lsetup "views ${LCG_RELEASE} ${LCG_PLATFORM}" || true
-CCACHE=$(command -v ccache)
-$CCACHE -z
-
-
export
if [ "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" == "main" ];then
@@ -128,12 +124,10 @@ cmake -S "${SCRIPT_DIR}/.." -B geomodel-build \
-DCMAKE_INSTALL_PREFIX=$gm_install_dir \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DGEOMODEL_BUILD_TOOLS=ON \
- -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \
heading "Build GeoModel"
cmake --build geomodel-build
-$CCACHE -s
echo "Installing GeoModel"
cmake --install geomodel-build > gm_install.log
@@ -155,14 +149,8 @@ popd > /dev/null
echo
fill_line "="
-echo "$CCACHE -z"
-$CCACHE -z
-
-echo "$CCACHE -C"
-$CCACHE -C
export CMAKE_PREFIX_PATH="${gm_install_dir}:$CMAKE_PREFIX_PATH"
-
heading "Configure Athena"
full_package_filters=$SCRIPT_DIR/package_filters.txt
@@ -208,7 +196,6 @@ cmake "$ATHENA_SOURCE/Projects/WorkDir" \
-DCMAKE_MAKE_PROGRAM="$NINJA" \
-DCMAKE_CXX_FLAGS="$EXTRA_FLAGS -isystem ${gm_install_dir}/include" \
-DATLAS_PACKAGE_FILTER_FILE="$package_filters" \
- -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \
-DCMAKE_INSTALL_PREFIX=$install_dir
popd
@@ -222,15 +209,11 @@ echo "export LD_LIBRARY_PATH=\"${gm_install_dir}/lib64:\${LD_LIBRARY_PATH}\"" >>
echo "export PATH=\"${gm_install_dir}/share:\${PATH}\"" >> athena-build/*/env_setup.sh
echo "export ROOT_INCLUDE_PATH=\"${gm_install_dir}/include:\${ROOT_INCLUDE_PATH}\"" >> athena-build/*/env_setup.sh
-
-
heading "Build Athena"
-
if [ -z "$CI" ]; then
- heading "Interactive mode, dropping into shell"
- bash
+ heading "Interactive mode, dropping into shell"
+ bash
else
- cmake --build athena-build -- -j3
- $CCACHE -s
- cmake --install athena-build > athena_install.log
+ cmake --build athena-build -- -j5
+ cmake --install athena-build > athena_install.log
fi
diff --git a/athena_ci/package_filters.txt b/athena_ci/package_filters.txt
index ae8bb3e96..55e0fc4f3 100644
--- a/athena_ci/package_filters.txt
+++ b/athena_ci/package_filters.txt
@@ -44,6 +44,7 @@
+ InnerDetector/InDetDetDescr/InDetTrackingGeometry
+ InnerDetector/InDetDetDescr/PixelGeoModel
+ InnerDetector/InDetDetDescr/PixelGeoModelXml
++ InnerDetector/InDetDetDescr/PixelReadoutDefinitions
+ InnerDetector/InDetDetDescr/PixelReadoutGeometry
+ InnerDetector/InDetDetDescr/SCT_GeoModel
+ InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
@@ -128,14 +129,3 @@
+ Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv
+ Tracking/TrkDetDescr/TrkDetElementBase
+ Trigger/TrigAlgorithms/TrigL2MuonSA
-+ graphics/GeometryJiveXML
-+ graphics/VP1/VP1Base
-+ graphics/VP1/VP1Systems/VP1AODSystems
-+ graphics/VP1/VP1Systems/VP1CaloSystems
-+ graphics/VP1/VP1Systems/VP1GeometrySystems
-+ graphics/VP1/VP1Systems/VP1GuideLineSystems
-+ graphics/VP1/VP1Systems/VP1PRDSystems
-+ graphics/VP1/VP1Systems/VP1RawDataSystems
-+ graphics/VP1/VP1Systems/VP1TrackSystems
-+ graphics/VP1/VP1Systems/VP1TrackingGeometrySystems
-+ graphics/VP1/VP1Utils
diff --git a/athena_ci/test_athena.sh b/athena_ci/test_athena.sh
index 406930c7d..c3cbc3788 100755
--- a/athena_ci/test_athena.sh
+++ b/athena_ci/test_athena.sh
@@ -12,9 +12,6 @@ export ATHENA_REF=main
_pwd=$PWD
-export ATHENA_SOURCE=$PWD/athena
-
-
tmp=/tmp/ath_build
rm -rf $tmp
mkdir -p $tmp
--
GitLab