From fcc0330dc39093617333cf2b0afe4528b9e1a345 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 28 Nov 2024 22:05:05 +0000
Subject: [PATCH] chore: podio-1.0.1
(cherry picked from commit 6a7b5017863eb348cde1cabb7c69dad180631699)
---
containers/debian/base.Dockerfile | 24 ++++++++++++------------
eic-spack.sh | 2 +-
key4hep-spack.sh | 2 +-
spack-environment/packages.yaml | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index e05fad6db..97e190154 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -218,18 +218,6 @@ spack mirror add --scope site --unsigned ghcr-${SPACK_VERSION} oci://ghcr.io/eic
spack mirror list
EOF
-## Setup eic-spack
-ENV EICSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/eic-spack
-ARG EICSPACK_ORGREPO="eic/eic-spack"
-ARG EICSPACK_VERSION="$SPACK_VERSION"
-ADD https://api.github.com/repos/${EICSPACK_ORGREPO}/commits/${EICSPACK_VERSION} /tmp/eic-spack.json
-RUN <<EOF
-set -e
-git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT}
-git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION}
-spack repo add --scope site "${EICSPACK_ROOT}"
-EOF
-
## Setup key4hep-spack
ENV KEY4HEPSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/key4hep-spack
ARG KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack"
@@ -241,3 +229,15 @@ git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${KEY4H
git -C ${KEY4HEPSPACK_ROOT} checkout ${KEY4HEPSPACK_VERSION}
spack repo add --scope site "${KEY4HEPSPACK_ROOT}"
EOF
+
+## Setup eic-spack
+ENV EICSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/eic-spack
+ARG EICSPACK_ORGREPO="eic/eic-spack"
+ARG EICSPACK_VERSION="$SPACK_VERSION"
+ADD https://api.github.com/repos/${EICSPACK_ORGREPO}/commits/${EICSPACK_VERSION} /tmp/eic-spack.json
+RUN <<EOF
+set -e
+git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT}
+git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION}
+spack repo add --scope site "${EICSPACK_ROOT}"
+EOF
diff --git a/eic-spack.sh b/eic-spack.sh
index 8874e728e..c5980768d 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,4 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="0ba184e0e84bc41a85b363afddaf9feae140f3a2"
+EICSPACK_VERSION="7b313ce3132d173cda8cdcf4fe2972c73b75cbee"
diff --git a/key4hep-spack.sh b/key4hep-spack.sh
index 90f2a1a31..44b0366d0 100644
--- a/key4hep-spack.sh
+++ b/key4hep-spack.sh
@@ -3,4 +3,4 @@ KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack"
## Key4HEP spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
-KEY4HEPSPACK_VERSION="ce50d74dba7c665157cbef63cd5c9cc4d7758f72"
+KEY4HEPSPACK_VERSION="d0a5a8d3ed386cd668a31540167d3f1317862cef"
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 2ef546645..1a9cd86b0 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -191,7 +191,7 @@ packages:
- -ipo +podio +root +zmq
juggler:
require:
- - '@14.2.0' # JUGGLER_VERSION
+ - '@14.2.1' # JUGGLER_VERSION
- cxxstd=20
k4actstracking:
require:
@@ -257,7 +257,7 @@ packages:
- '@1.0.0'
podio:
require:
- - '@0.99'
+ - '@1.0.1'
- cxxstd=20
prmon:
require:
--
GitLab