From be2ce926fa721e01d8b79d2e824858eb58949aab Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 4 Feb 2025 18:30:19 +0000 Subject: [PATCH 1/3] feat: spack install source --- containers/eic/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/containers/eic/Dockerfile b/containers/eic/Dockerfile index 6838c6b9..d1399be4 100644 --- a/containers/eic/Dockerfile +++ b/containers/eic/Dockerfile @@ -79,7 +79,7 @@ export CCACHE_DIR=/ccache mkdir -p /var/cache/spack/blobs/sha256/ find /var/cache/spack/blobs/sha256/ -ignore_readdir_race -atime +7 -delete make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ - SPACK_ENV=${SPACK_ENV} + SPACK_ENV=${SPACK_ENV} SPACK_INSTALL_FLAGS="--source" ccache --show-stats ccache --zero-stats EOF @@ -126,7 +126,7 @@ RUN --mount=type=cache,target=/var/cache/spack \ --mount=type=secret,id=GITHUB_REGISTRY_TOKEN,env=GITHUB_REGISTRY_TOKEN \ < Date: Sun, 16 Nov 2025 18:40:04 -0600 Subject: [PATCH 2/3] feat: add package_attributes: install_source: true --- spack-environment/packages.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 0eaa1e6a..114a7cc1 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -21,6 +21,8 @@ packages: - '%clang' - '@39.2.0' - cxxstd=20 +dd4hep ~edm4hep +examples +fatras +geant4 +json +onnx +podio +python +tgeo + package_attributes: + install_source: true actsvg: require: - '@0.4.26' @@ -90,6 +92,8 @@ packages: - '@1.32.1' - +ddg4 +ddcad +hepmc3 +xercesc - any_of: [+ddeve +utilityapps, -ddeve -utilityapps] # FIXME ^root +x +opengl when +utilityapps + package_attributes: + install_source: true dpmjet: require: - '@19.3.5' @@ -116,6 +120,8 @@ packages: require: - '%clang' - '@1.27.1' # EICRECON_VERSION + package_attributes: + install_source: true eigen: require: - '@3.4.0' @@ -125,6 +131,8 @@ packages: epic: require: - 'artifacts=epic_craterlake' + package_attributes: + install_source: true fastjet: require: - '@3.5.0' @@ -198,6 +206,8 @@ packages: irt: require: - '@1.0.8' + package_attributes: + install_source: true iwyu: require: - '@0.23' @@ -205,6 +215,8 @@ packages: require: - '@2.4.2' - -ipo +podio +root +zmq + package_attributes: + install_source: true juggler: require: - '%clang' @@ -293,6 +305,8 @@ packages: - '@1.2' - cxxstd=20 - +rntuple + package_attributes: + install_source: true prmon: require: - +plot From 53c8f6ae4734954ba1943a0bdc43e1dedaad7c13 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 16 Nov 2025 18:43:10 -0600 Subject: [PATCH 3/3] Revert "feat: spack install source" This reverts commit be2ce926fa721e01d8b79d2e824858eb58949aab --- containers/eic/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/containers/eic/Dockerfile b/containers/eic/Dockerfile index d1399be4..6838c6b9 100644 --- a/containers/eic/Dockerfile +++ b/containers/eic/Dockerfile @@ -79,7 +79,7 @@ export CCACHE_DIR=/ccache mkdir -p /var/cache/spack/blobs/sha256/ find /var/cache/spack/blobs/sha256/ -ignore_readdir_race -atime +7 -delete make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ - SPACK_ENV=${SPACK_ENV} SPACK_INSTALL_FLAGS="--source" + SPACK_ENV=${SPACK_ENV} ccache --show-stats ccache --zero-stats EOF @@ -126,7 +126,7 @@ RUN --mount=type=cache,target=/var/cache/spack \ --mount=type=secret,id=GITHUB_REGISTRY_TOKEN,env=GITHUB_REGISTRY_TOKEN \ <