diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49ca31cebbbc7dec67a4db645b4644da2626d8c0..035471afe669b54c983cc22f1f56553edbb4b4ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: ## Application versions used for the main release ## note: nightly builds will always use the master/main branch JUGGLER_VERSION: "v9.3.0" - EICRECON_VERSION: "v0.6.4" + EICRECON_VERSION: "v1.0.0" ## Spack organization and repository, e.g. spack/spack SPACK_ORGREPO: "spack/spack" @@ -21,7 +21,11 @@ variables: 2f057d729da61e8c12828df44377f0a93fed820f 39a1f1462b0abf12dfaccd33f84142c852c4b56e 4b12d015e1c316b4837e02ae37e2c69a8a647180 + f83d47442dade012b1019840181b8dd459fd8edd 7f1467e795b1cab8b4855e019910c509896ea0e1 + ebc24b7063ba9a8eb43b4424aac5143cf958d76f + a47ebe57841f13239e881ed69eab4949b1d98c32 + ab999d5af90f1bff644b5134bb370b2716e1bcf0 62da76cb5dca4d52c43bee06230cca6a5882f05d cc2ae9f270befa554ba8b09c68e89bb8248ea650 ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228 @@ -43,7 +47,11 @@ variables: ## 2f057d729da61e8c12828df44377f0a93fed820f: py-scipy: add v1.9 ## 39a1f1462b0abf12dfaccd33f84142c852c4b56e: SIP build system: fix "python not defined in builder" ## 4b12d015e1c316b4837e02ae37e2c69a8a647180: py-jinja2-cli: new package + ## f83d47442dade012b1019840181b8dd459fd8edd: dd4hep: depends_on root +x +opengl when +utilityapps ## 7f1467e795b1cab8b4855e019910c509896ea0e1: dd4hep: new version 1.24, depends_on podio@0.16: + ## ebc24b7063ba9a8eb43b4424aac5143cf958d76f: dd4hep: extend conflict on CMake + ## a47ebe57841f13239e881ed69eab4949b1d98c32: dd4hep: new versions 1.25, 1.25.1 + ## ab999d5af90f1bff644b5134bb370b2716e1bcf0: dd4hep: depends_on root +webgui when +ddeve ^root @6.28: ## 62da76cb5dca4d52c43bee06230cca6a5882f05d: directives: depends_on should not admit anonymous specs ## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive ## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG @@ -509,7 +517,7 @@ benchmarks:physics: - version - jug_xl:default variables: - RECO: "juggler" + RECO: "eicrecon" BENCHMARKS_TAG: "$INTERNAL_TAG" BENCHMARKS_CONTAINER: "jug_xl" BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE" diff --git a/spack-environment/dev/spack.yaml b/spack-environment/dev/spack.yaml index 949e92139396ad03d50f90aca8970043f775a034..00153bf1101274768e62093483e24bd1376377d6 100644 --- a/spack-environment/dev/spack.yaml +++ b/spack-environment/dev/spack.yaml @@ -15,7 +15,7 @@ spack: - cppcoro@git.10bbcdbf2be3ad3aa56febcf4c7662d771460a99 - dawn@3_91a - dawncut@1_54a - - dd4hep@1.24 +ddg4 +ddcad -frames +hepmc3 +lcio + - dd4hep@1.25.1 +ddg4 +ddcad +hepmc3 +lcio - edm4eic@1.2.2 cxxstd=17 - edm4hep@0.7 cxxstd=17 - eic-smear@1.1.10