diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index eba641412316da79bbd83a3ca67b3383dd5f6cfd..45d68e3f50e23e6f0ec110b030243d20a9ab9596 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -151,7 +151,7 @@ mkdir -p /var/cache/spack/blobs/sha256/ find /var/cache/spack/blobs/sha256/ -ignore_readdir_race -atime +7 -delete echo -e "\n view: false" >> ${SPACK_ENV}/spack.yaml spack env activate --dir ${SPACK_ENV} -spack concretize --fresh --force --quiet +spack concretize --fresh --force make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ SPACK_ENV=${SPACK_ENV} \ BUILDCACHE_OCI_PROMPT="eicweb" \ @@ -204,7 +204,7 @@ if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then sed -i "/# JUGGLER_VERSION$/ s/@[^' ]*/@git.${JUGGLER_VERSION}=main/" /opt/spack-environment/packages.yaml spack deconcretize -y --all juggler fi -spack concretize --fresh --force --quiet +spack concretize --fresh --force make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ SPACK_ENV=${SPACK_ENV} \ BUILDCACHE_OCI_FINAL="eicweb" \ diff --git a/spack.sh b/spack.sh index ca1a57906286c46769c958a95224e841db6527c3..5d11bb4b70573cb2beb12c736e96255527bf9de1 100644 --- a/spack.sh +++ b/spack.sh @@ -13,6 +13,7 @@ f6d50f790ee8b123f7775429f6ca6394170e6de9 63f6e6079aacc99078386e5c8ff06173841b9595 9bcc43c4c158639fa6cb575c6106595a34682081 9f3e45ddbee24aaa7993e575297827e0aed2e6fe +85f13442d2a7486daba81fdd9a3b6a1182ba11f6 --- ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ @@ -25,3 +26,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list> ## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21" ## 9f3e45ddbee24aaa7993e575297827e0aed2e6fe: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES +## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments \ No newline at end of file