containers/jug/dev.Dockerfile

@@ -70,14 +70,6 @@ spack compiler find --scope site
 spack config blame compilers
 EOF
 
-## Setup local buildcache mirrors
-RUN --mount=type=cache,target=/var/cache/spack <<EOF
-set -e
-spack mirror add local /var/cache/spack/mirror/${SPACK_VERSION}
-spack buildcache update-index local
-spack mirror list
-EOF
-
 ## Setup eics3 buildcache mirrors
 ## - this always adds the read-only mirror to the container
 ## - the write-enabled mirror is provided later as a secret mount
@@ -144,13 +136,13 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM}              \
     <<EOF
 set -e
 export CCACHE_DIR=/ccache
-spack buildcache update-index local
+find /var/cache/spack/blobs/sha256/ -atime +7 -delete
 spack buildcache update-index eics3rw
 spack env activate --dir ${SPACK_ENV}
 spack add juggler@git.${JUGGLER_VERSION}
 spack add eicrecon@git.${EICRECON_VERSION}
 spack concretize --fresh --force --quiet
-make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw"
+make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR_ONLY_PACKAGE="eics3rw" BUILDCACHE_MIRROR_DEPENDENCIES="eicweb ghcr"
 ccache --show-stats
 ccache --zero-stats
 EOF
@@ -158,9 +150,8 @@ EOF
 ## Create view at /usr/local
 RUN --mount=type=cache,target=/var/cache/spack <<EOF
 set -e
-spack env activate --dir ${SPACK_ENV}
 rm -r /usr/local
-spack env view enable /usr/local
+spack -e ${SPACK_ENV} env view enable /usr/local
 EOF
 
 ## Optional, nuke the buildcache after install, before (re)caching

mirrors.yaml.in

 mirrors:
+  eicweb:
+    url: oci://${CI_REGISTRY}/${CI_PROJECT_PATH}/spack-${SPACK_VERSION}
+    push:
+      access_pair:
+      - ${CI_REGISTRY_USER}
+      - ${CI_REGISTRY_PASSWORD}
+  ghcr:
+    url: oci://ghcr.io/eic/spack-${SPACK_VERSION}
+    push:
+      access_pair:
+      - ${GITHUB_REGISTRY_USER}
+      - ${GITHUB_REGISTRY_TOKEN}
   eics3rw:
     fetch:
       url: s3://eictest/EPIC/spack/${SPACK_VERSION}

spack-environment/Makefile

@@ -7,7 +7,9 @@ export SPACK_COLOR = always
 
 SPACK_ENV ?= dev
 
-BUILDCACHE_MIRROR :=
+BUILDCACHE_MIRROR_ONLY_PACKAGE :=
+BUILDCACHE_MIRROR_DEPENDENCIES :=
+BUILDCACHE_OCI_BASE_IMAGE := ghcr.io/eic/debian:stable-slim
 
 .PHONY: all clean
 
@@ -18,11 +20,13 @@ include $(SPACK_ENV)/spack.mk
 endif
 
 $(SPACK_ENV)/push: $(addprefix $(SPACK_ENV)/push/,$($(SPACK_ENV)/SPACK_PACKAGE_IDS))
-	$(foreach buildcache, $(BUILDCACHE_MIRROR), $(SPACK) buildcache update-index $(buildcache) ;)
+	$(foreach buildcache, $(BUILDCACHE_MIRROR_ONLY_PACKAGE), $(SPACK) buildcache update-index $(buildcache) ;)
+	$(foreach buildcache, $(BUILDCACHE_MIRROR_DEPENDENCIES), $(SPACK) buildcache update-index $(buildcache) ;)
 
 $(SPACK_ENV)/push/%: $(SPACK_ENV)/install/%
 	@mkdir -p $(dir $@)
-	$(foreach buildcache, $(BUILDCACHE_MIRROR), $(SPACK) buildcache push --only=package --unsigned $(buildcache) /$(HASH) ;) # push $(SPEC)
+	$(foreach buildcache, $(BUILDCACHE_MIRROR_ONLY_PACKAGE), $(SPACK) buildcache push --only=package --unsigned $(buildcache) /$(HASH) ;) # push $(SPEC)
+	$(foreach buildcache, $(BUILDCACHE_MIRROR_DEPENDENCIES), $(SPACK) buildcache push --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) /$(HASH) | grep -v "Using cached archive" ;) # push $(SPEC)
 	@touch $@
 
 $(SPACK_ENV)/spack.lock: $(SPACK_ENV)/spack.yaml Makefile

spack-environment/dev/spack.yaml

@@ -39,6 +39,7 @@ spack:
   - irt
   - iwyu
   - jana2
+  - k4fwcore
   - lcov
   - lhapdf
   - madx

spack-environment/packages.yaml

@@ -87,7 +87,7 @@ packages:
     - cxxstd=20
   edm4hep:
     require:
-    - '@0.10'
+    - '@0.10.2'
     - cxxstd=20
   eic-smear:
     require:
@@ -158,6 +158,9 @@ packages:
   juggler:
     require:
     - cxxstd=20
+  k4fwcore:
+    require:
+    - '@1.0pre17'
   lapack:
     require:
     - openblas
@@ -227,7 +230,7 @@ packages:
     - '@2.1.1'
   py-bokeh:
     require:
-    - '@2.4.3'
+    - '@3.3.1'
   py-boto3:
     require:
     - '@1.26.26'
@@ -272,7 +275,7 @@ packages:
     - '@1.16-33-g3788bb4'
   py-numpy:
     require:
-    - '@1.23.4'
+    - '@1.26.1'
   py-pandas:
     require:
     - '@1.5.3'
@@ -282,6 +285,9 @@ packages:
   py-pre-commit:
     require:
     - '@2.20.0'
+  py-pygithub:
+    require:
+    - '@2.1.1'
   py-pycairo:
     require:
     - '@1.20.0'
@@ -290,7 +296,7 @@ packages:
     - '@6.0'
   py-scipy:
     require:
-    - '@1.10.1'
+    - '@1.11.3'
   py-seaborn:
     require:
     - '@0.12.2'

spack.sh

@@ -16,8 +16,10 @@ c485709f625429a88a184a099373d76c9438f8e3
 6f08daf67020289e6a5ed1df9783ac5b2919e477
 50051b56199992eb4395b8ff22913c1995311a8c
 f01774f1d41781bc4b9e5abb5469e234168da663
-cfa2f19f48699a762af77ece8a9c5bc4db3a75d5
-2433f503b73bb515b2e1a7615ae01fea59d2290e
+16f4c53cd4cfb4bc6c9390f6e65217fc9ccc58c9
+d171f314c77ba61b3cd780f159afe6abced5707d
+b111064e221aae83e62226672cd8bf9a7524423d
+3c54177c5d9032cb36cf154b553d739cbeb2d024
 ---
 ## Ref: https://github.com/spack/spack/commit/[hash]
 ## [hash]: [description]
@@ -29,5 +31,7 @@ cfa2f19f48699a762af77ece8a9c5bc4db3a75d5
 ## 6f08daf67020289e6a5ed1df9783ac5b2919e477: root: add a webgui patch
 ## 50051b56199992eb4395b8ff22913c1995311a8c: geant4: new version 11.1.3
 ## f01774f1d41781bc4b9e5abb5469e234168da663: hepmc3: fix from_variant -> self.define
-## cfa2f19f48699a762af77ece8a9c5bc4db3a75d5: py-htgettoken: use os.environ, avoid AttributeError
-## 2433f503b73bb515b2e1a7615ae01fea59d2290e: py-htgettoken: allow for undefined variables
+## 16f4c53cd4cfb4bc6c9390f6e65217fc9ccc58c9: py-bokeh: new version 3.3.1, and supporting packages
+## d171f314c77ba61b3cd780f159afe6abced5707d: py-pygithub: new versions, dependencies
+## b111064e221aae83e62226672cd8bf9a7524423d: py-htgettoken: use os.environ, avoid AttributeError
+## 3c54177c5d9032cb36cf154b553d739cbeb2d024: edm4hep: add latest tag for 0.10.2