Skip to content

Commit 04c9eb5

Browse files
committed
fix: separate root requirements and apply per environment
1 parent e57a1b8 commit 04c9eb5

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

spack-environment/ci/spack.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ spack:
22
include:
33
- ../concretizer.yaml
44
- ../packages.yaml
5+
- ../packages_root_without_opengl.yaml
56
- ../view.yaml
67
concretizer:
78
unify: when_possible # FIXME Using mixture of gcc and clang
@@ -68,11 +69,7 @@ spack:
6869
- py-toml
6970
- py-uproot
7071
- py-vector
71-
- root -opengl -webgui
72+
- root
7273
- snakemake
7374
- spdlog
7475
- xrootd
75-
packages:
76-
dd4hep:
77-
require:
78-
- -ddeve -utilityapps
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
packages:
2+
root:
3+
require:
4+
- +opengl +webgui
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
packages:
2+
root:
3+
require:
4+
- ~opengl ~webgui

spack-environment/xl/spack.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ spack:
22
include:
33
- ../concretizer.yaml
44
- ../packages.yaml
5+
- ../packages_root_with_opengl.yaml
56
- ../view.yaml
67
concretizer:
78
unify: when_possible # FIXME Using mixture of gcc and clang
@@ -116,7 +117,7 @@ spack:
116117
- py-wurlitzer
117118
- py-yapf
118119
- rivet
119-
- root +opengl +webgui +x
120+
- root
120121
- sherpa
121122
- simsipm
122123
- slurm sysconfdir=/etc/slurm
@@ -127,7 +128,3 @@ spack:
127128
- valgrind
128129
- xrootd
129130
- xeyes
130-
packages:
131-
dd4hep:
132-
require:
133-
- +ddeve +utilityapps

0 commit comments

Comments
 (0)