From 213a8187b715044b74554e94d0f864c2ff76b332 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Mon, 13 Jun 2022 21:09:45 +0000
Subject: [PATCH] Remove local acts, cherry-pick upstream
---
.gitlab-ci.yml | 3 ++-
spack/packages/acts/package.py | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
delete mode 100644 spack/packages/acts/package.py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ec71d2f9..d5ad63182 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,9 @@ variables:
## Spack github version, v0.18.0
SPACK_VERSION: "4c6564f10aa516bc00c1d7dbfdeafe35128985fe"
## Space-separated list of spack cherry-picks
- SPACK_CHERRYPICKS: ""
+ SPACK_CHERRYPICKS: "adc9f887eac78a81bb8189d603f4dc45ed3509c1"
## Ref: https://github.com/spack/spack/commit/[hash]
+ ## adc9f887eac78a81bb8189d603f4dc45ed3509c1: acts-dd4hep: new package; acts: new version
## We need to enable Docker Buildkit to use cache mounts and better
## build performance overal
diff --git a/spack/packages/acts/package.py b/spack/packages/acts/package.py
deleted file mode 100644
index e22339156..000000000
--- a/spack/packages/acts/package.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from spack.pkg.builtin.acts import Acts as BuiltinActs
-class Acts(BuiltinActs):
- version('19.1.0', commit='82f42a2cc80d4259db251275c09b84ee97a7bd22', submodules=True)
--
GitLab