From afb39ffdd7e2f42dd5ab21231dbd3c87de994378 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Tue, 14 Jan 2025 04:30:27 +0000 Subject: [PATCH 1/5] chore: acts-36.3.2 --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index a55922eb..83088382 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -19,7 +19,7 @@ packages: acts: require: - '%clang' - - '@35.2.0' + - '@36.3.2' - cxxstd=20 +dd4hep +edm4hep +examples +fatras +geant4 +json +onnx +podio +python +tgeo actsvg: require: -- GitLab From 320d8190af7ed0b5d57d8632500c01354f9e195a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Fri, 17 Jan 2025 01:03:19 +0000 Subject: [PATCH 2/5] test: eicrecon@git.acts-38 --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 83088382..09a3c8d3 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -115,7 +115,7 @@ packages: eicrecon: require: - '%clang' - - '@1.22.0' # EICRECON_VERSION + - '@git.acts-38' # EICRECON_VERSION eigen: require: - '@3.4.0' -- GitLab From c7d7943d59bb3da655916d24460c4d348b79bffa Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Sat, 18 Jan 2025 00:23:27 +0000 Subject: [PATCH 3/5] test: juggler@git.acts-38 --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 09a3c8d3..00de1d87 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -205,7 +205,7 @@ packages: juggler: require: - '%clang' - - '@14.2.2' # JUGGLER_VERSION + - '@git.acts-38' # JUGGLER_VERSION - cxxstd=20 k4actstracking: require: -- GitLab From a81b6c9ea10e6d2b300eb8fd702bd0f3100e3c33 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Sun, 9 Feb 2025 18:11:07 +0000 Subject: [PATCH 4/5] chore: eic-spack: k4actstracking: filter_file when Acts version >= 37 --- eic-spack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eic-spack.sh b/eic-spack.sh index a78a43cd..fde2deb8 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -3,4 +3,4 @@ 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="e3b94e80be4351bcb197402d3c8ba66fde9062b7" \ No newline at end of file +EICSPACK_VERSION="e3b94e80be4351bcb197402d3c8ba66fde9062b7" -- GitLab From b32fd0386717317cfb91c0fe55d69c4d7d677d80 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Fri, 21 Feb 2025 18:15:43 +0000 Subject: [PATCH 5/5] Revert "test: juggler@git.acts-38" This reverts commit c7d7943d59bb3da655916d24460c4d348b79bffa --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 00de1d87..09a3c8d3 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -205,7 +205,7 @@ packages: juggler: require: - '%clang' - - '@git.acts-38' # JUGGLER_VERSION + - '@14.2.2' # JUGGLER_VERSION - cxxstd=20 k4actstracking: require: -- GitLab