containers/jug/dev.Dockerfile

@@ -290,8 +290,9 @@ COPY singularity.d /.singularity.d
 ## Fixup /opt/detector/epic-git.fcf90937193c983c0af2acf1251e01f2e2c3a259_main
 RUN <<EOF
 shopt -s nullglob
-for detector in /opt/detector/epic-git.*_* ; do
-  ln -s ${detector} /opt/detector/epic-${detector/*_/}
+cd /opt/detector
+for detector in epic-git.*_* ; do
+  ln -s ${detector} epic-${detector/*_/}
 done
 EOF
 

spack-environment/Makefile

@@ -25,7 +25,7 @@ $(SPACK_ENV)/push: $(addprefix $(SPACK_ENV)/push/,$($(SPACK_ENV)/SPACK_PACKAGE_I
 	$(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache push --unsigned $(buildcache) ;)
 	$(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache update-index $(buildcache) ;)
 	$(foreach buildcache, $(BUILDCACHE_S3_PROMPT), $(SPACK) buildcache update-index $(buildcache) ;)
-	$(foreach buildcache, $(BUILDCACHE_OCI_FINAL), $(SPACK) buildcache push --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) ;)
+	$(foreach buildcache, $(BUILDCACHE_OCI_FINAL), $(SPACK) buildcache push --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) | grep -v "Using cached archive" ;)
 
 $(SPACK_ENV)/push/%: $(SPACK_ENV)/install/%
 	@mkdir -p $(dir $@)

spack-environment/packages.yaml

@@ -91,7 +91,7 @@ packages:
     - cxxstd=20
   edm4hep:
     require:
-    - '@0.10.3'
+    - '@0.10.5'
     - cxxstd=20
   egl:
     buildable: False

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