From fa1fdeb76c4702800e2c1472b2d784d35424748d Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 11 Aug 2022 22:40:07 +0000
Subject: [PATCH] feat: podio@0.15, edm4hep@0.6 (for upstream EDMs)
---
.gitlab-ci.yml | 6 +++---
spack.yaml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dc73bdb2..b83dcbd20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,9 +16,9 @@ variables:
## adc9f887eac78a81bb8189d603f4dc45ed3509c1: acts-dd4hep: new package; acts: new version
## 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0: lcio, podio, edm4hep: add latest versions
- ## Spack github version, e.g. v0.18 or commit hash
- EICSPACK_VERSION: "d7606f67a36708dcc0c045a269621f4189345aad"
- ## Space-separated list of eic=spack cherry-picks
+ ## Spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash
+ EICSPACK_VERSION: "v0.18.3"
+ ## Space-separated list of eic-spack cherry-picks
EICSPACK_CHERRYPICKS: ""
## We need to enable Docker Buildkit to use cache mounts and better
diff --git a/spack.yaml b/spack.yaml
index 26d5d3166..b4528544b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -8,7 +8,7 @@ spack:
- dawn@3_91a
- dawncut@1_54a
- dd4hep@1.20.2 +ddg4 -ddcad +hepmc3 +ipo +lcio
- - edm4hep@0.4.1 cxxstd=17 -ipo
+ - edm4hep@0.6 cxxstd=17 -ipo
- eigen@3.4.0
- emacs@27.2 toolkit=athena
- fastjet@3.3.4
@@ -26,7 +26,7 @@ spack:
- nlohmann-json@3.10.5
- opencascade@7.6.0
- pkg-config@0.29.2
- - podio@0.14.1 build_type=RelWithDebInfo
+ - podio@0.15 build_type=RelWithDebInfo
- pythia8@8.306 +fastjet
- python@3.10.4
- py-numpy@1.22.3
--
GitLab