diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0109963cc6b335f38f3d4c63bed4f7b889ec85ea..b34a1e6b632f9ec680d1866f34ada13b97d831a2 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 ba53572ed483ad4fb868f170ec7712365a524278..b1043ab706b0b373a9a8377a01b243ca6cc0cbd0 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 82f6e260c2ca4fe8337738a07502d684656b0558..8746eec147b737eb3a0a258b94e1ca66bd15ce46 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 4cf7f9439af2265f79abe65f7aa100760a044fbc..6abb6d77df8cecf72067e5f7281506143644396f 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