diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e07cc21aea63c0053e3e7e97bd5756f2d3f78a6..9a1de28c29200e9e61cf8052b2ddfff5cef7da1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,8 @@ variables: ## Application versions used for the main release ## note: nightly builds will always use the master/main branch - JUGGLER_VERSION: "v10.0.1" - EICRECON_VERSION: "v1.4.1" + JUGGLER_VERSION: "v10.1.0" + EICRECON_VERSION: "v1.5.0" ## Local registry CI_PUSH: 1 diff --git a/detectors.yaml b/detectors.yaml index b2feb1b769f8e8e52c98fd74762696fbd337c937..a5a6555d1392a4d5552241b455a48632e8a6a719 100644 --- a/detectors.yaml +++ b/detectors.yaml @@ -5,10 +5,6 @@ detectors: version: main main: version: main - 23.03.0: - version: 23.03.0 - patches: - - https://github.com/eic/epic/pull/449.patch 23.05.0: version: 23.05.0 patches: @@ -37,3 +33,5 @@ detectors: version: 23.07.2 23.08.0: version: 23.08.0 + 23.09.0: + version: 23.09.0 diff --git a/eic-spack.sh b/eic-spack.sh index 506da8e6b7ce4393c36146440c98eb77bb733dcc..dd606dd9ec8f219b3448038f584cbd89ce0687cf 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack" ## EIC spack github version, e.g. v0.19.7 or commit hash ## note: nightly builds will use e.g. releases/v0.19 -EICSPACK_VERSION="v0.20.15" +EICSPACK_VERSION="v0.20.17" ## 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 e71086e8b2df5f3d3149d188ee6cbb77de99b5cf..e0103970b6cd7ff0713c5f250232f0bd1eb44677 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -80,7 +80,7 @@ packages: - '@656aa3192b097a631ddd1e0380e80c26fd6644a7' edm4eic: require: - - '@2.1.0' + - '@3.0.1' - cxxstd=17 edm4hep: require: @@ -164,7 +164,7 @@ packages: - '@3.11.2' npsim: require: - - '@1.2.0' + - '@1.3.0' - +http - any_of: [+geocad, -geocad] onnx: