From a91cfa1be7642994cb356acd9c2cc8d3861b070a Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 22 Aug 2022 15:45:33 +0000
Subject: [PATCH] chore: upgrade dd4hep to 1.21
---
.gitlab-ci.yml | 5 +++--
spack.yaml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c756e36e..3bbe8f1b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,17 +4,18 @@ variables:
## Application versions used for the main release
## note: nightly builds will always use the master/main branch
JUGGLER_VERSION: "v7.0.0"
- NPDET_VERSION: "v1.3.1"
+ NPDET_VERSION: "v1.3.2"
EICD_VERSION: "v2.0.0"
AFTERBURNER_VERSION: "v0.1.2"
## Spack github version, e.g. v0.18.1 or commit hash
SPACK_VERSION: "v0.18.1"
## Space-separated list of spack cherry-picks
- SPACK_CHERRYPICKS: "adc9f887eac78a81bb8189d603f4dc45ed3509c1 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0"
+ SPACK_CHERRYPICKS: "adc9f887eac78a81bb8189d603f4dc45ed3509c1 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0 afc044cbad5eb8c5ffd6efe364fb740a08623842"
## Ref: https://github.com/spack/spack/commit/[hash]
## adc9f887eac78a81bb8189d603f4dc45ed3509c1: acts-dd4hep: new package; acts: new version
## 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0: lcio, podio, edm4hep: add latest versions
+ ## afc044cbad5eb8c5ffd6efe364fb740a08623842: dd4hep: add v1.21
## Spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash
EICSPACK_VERSION: "v0.18.5"
diff --git a/spack.yaml b/spack.yaml
index efd3363ff..e90a92086 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -8,7 +8,7 @@ spack:
- cnpy@master
- dawn@3_91a
- dawncut@1_54a
- - dd4hep@1.20.2 +ddg4 -ddcad +hepmc3 +ipo +lcio
+ - dd4hep@1.21 +ddg4 -ddcad +hepmc3 +ipo +lcio
- edm4hep@0.6 cxxstd=17 -ipo
- eigen@3.4.0
- emacs@27.2 toolkit=athena
--
GitLab