From 40992ccbe53b7c916ae891024eb8db2d728fdea2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin <dkalinkin@bnl.gov> Date: Wed, 10 Apr 2024 22:59:45 +0000 Subject: [PATCH] chore: eicrecon-1.12.0, epic-eic-24.04.0 --- detectors.yaml | 10 ++-------- eic-spack.sh | 2 +- spack-environment/packages.yaml | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/detectors.yaml b/detectors.yaml index 9e81c805b..a796b6f30 100644 --- a/detectors.yaml +++ b/detectors.yaml @@ -6,14 +6,6 @@ detectors: version: main main: version: main - 23.09.0: - version: 23.09.0 - patches: - - https://github.com/eic/epic/pull/520.patch - 23.09.1: - version: 23.09.1 - patches: - - https://github.com/eic/epic/pull/520.patch 23.10.0: version: 23.10.0 23.11.0: @@ -28,3 +20,5 @@ detectors: version: 24.03.0 24.03.1: version: 24.03.1 + 24.04.0: + version: 24.04.0 diff --git a/eic-spack.sh b/eic-spack.sh index e3c3f722a..43f01d7ad 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -3,7 +3,7 @@ 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="85287c4753174c59f6708e49b83f2c6f4f1014eb" +EICSPACK_VERSION="51841e81dc80250c0cad5f69349aa8ed7fab7cd0" ## Space-separated list of eic-spack cherry-picks read -r -d '' EICSPACK_CHERRYPICKS <<- \ diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index a3881e03b..8f7e51f40 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -94,7 +94,7 @@ packages: - '@1.1.12' eicrecon: require: - - '@1.11.0' + - '@1.12.0' eigen: require: - '@3.4.0' -- GitLab