From 75e740734d97e2f6b6f29da63449f0d432ca4b37 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 7 Sep 2024 20:17:37 +0000
Subject: [PATCH] fix: reenable dbg and prod
---
.gitlab-ci.yml | 4 ++--
spack-environment/dbg/spack.yaml | 2 ++
spack-environment/packages.yaml | 6 +++---
spack-environment/prod/spack.yaml | 6 ++++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0109963cc..b34a1e6b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -310,8 +310,8 @@ eic:
BUILD_IMAGE: eic_
PLATFORM: linux/amd64
ENV:
-# - dbg
-# - prod
+ - dbg
+ - prod
- xl
# - BUILD_TYPE:
# - default
diff --git a/spack-environment/dbg/spack.yaml b/spack-environment/dbg/spack.yaml
index ba53572ed..b1043ab70 100644
--- a/spack-environment/dbg/spack.yaml
+++ b/spack-environment/dbg/spack.yaml
@@ -2,6 +2,8 @@ spack:
include:
- ../concretizer.yaml
- ../packages.yaml
+ concretizer:
+ unify: true
config:
install_missing_compilers: false
specs:
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 82f6e260c..8746eec14 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -77,8 +77,8 @@ packages:
dd4hep:
require:
- '@1.29'
- - +ddg4 +ddcad +hepmc3 +utilityapps +xercesc
- - any_of: [+ddeve, -ddeve]
+ - +ddg4 +ddcad +hepmc3 +xercesc
+ - any_of: [+ddeve +utilityapps, -ddeve -utilityapps]
dpmjet:
require:
- '@19.3.5'
@@ -146,7 +146,7 @@ packages:
geant4:
require:
- '@11.2.2.east'
- - cxxstd=20 -vecgeom +threads -vtk
+ - cxxstd=20 -vecgeom +threads -timemory -vtk
- any_of: [+opengl +qt +x11, -opengl -qt -x11]
gettext:
require:
diff --git a/spack-environment/prod/spack.yaml b/spack-environment/prod/spack.yaml
index 4cf7f9439..6abb6d77d 100644
--- a/spack-environment/prod/spack.yaml
+++ b/spack-environment/prod/spack.yaml
@@ -2,6 +2,8 @@ spack:
include:
- ../concretizer.yaml
- ../packages.yaml
+ concretizer:
+ unify: true
config:
install_missing_compilers: false
specs:
@@ -25,5 +27,5 @@ spack:
- py-jinja2
- py-jinja2-cli
- py-pip
- - root -opengl
- - xrootd
\ No newline at end of file
+ - root -opengl ~webgui ~x
+ - xrootd
--
GitLab