From 7acab7c1ef8add4985e2b869203691c0d475a392 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 20 Apr 2023 22:12:08 +0000
Subject: [PATCH] feat: dd4hep +xercesc
---
containers/jug/dev.Dockerfile | 6 ++++--
spack-environment/dev/spack.yaml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index ce384b625..b91178f52 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -105,8 +105,10 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
&& source $SPACK_ROOT/share/spack/setup-env.sh \
&& spack env activate --dir /opt/spack-environment/${ENV} \
&& make -C /opt/spack-environment SPACK_ENV=${ENV} \
- BUILDCACHE_DIR=/var/cache/spack-mirror \
- BUILDCACHE_MIRROR=eic-spack
+ BUILDCACHE_DIR=/var/cache/spack-mirror
+# FIXME disabled S3 buildcache until multipart upload fixed
+# \
+# BUILDCACHE_MIRROR=eic-spack
## Create view at /usr/local
RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
diff --git a/spack-environment/dev/spack.yaml b/spack-environment/dev/spack.yaml
index 16b588390..3ea7b11d4 100644
--- a/spack-environment/dev/spack.yaml
+++ b/spack-environment/dev/spack.yaml
@@ -15,7 +15,7 @@ spack:
- cppcoro@git.10bbcdbf2be3ad3aa56febcf4c7662d771460a99
- dawn@3_91a
- dawncut@1_54a
- - dd4hep@1.25.1 +ddg4 +ddcad +hepmc3 +lcio
+ - dd4hep@1.25.1 +ddg4 +ddcad +hepmc3 +lcio +xercesc
- edm4eic@2.0.0 cxxstd=17
- edm4hep@0.7 cxxstd=17
- eic-smear@1.1.10
--
GitLab