diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91b69247896c026d62a841db349abba75159f2fc..224c9408d26f4c7064aadb496e9334f36a31a695 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,14 +2,14 @@ image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest variables: ## Application versions used for the main release ## note: nightly builds will always use the master branch - JUGGLER_VERSION: "v1.8.0" - NPDET_VERSION: "v0.5.0" + JUGGLER_VERSION: "v2.0.0" + NPDET_VERSION: "v0.6.0" EICD_VERSION: "v0.2.0" - DETECTOR_VERSION: "v0.1.0" - IP6_VERSION: "v0.2.0" + DETECTOR_VERSION: "v0.2.0" + IP6_VERSION: "v0.3.0" ## Spack github version - SPACK_VERSION: "175e6e8c1e9644c6a92db8b338b36dcc0bf88af0" + SPACK_VERSION: "a68abc15c5b1b8266130f765d1bee6290e71fa7c" ## We need to enable Docker Buildkit to use cache mounts and better ## build performance overal diff --git a/VERSION b/VERSION index fd2a01863fdd3035fac5918c59666363544bfe23..fcdb2e109f68cff5600955a73908885fe8599bb4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0 +4.0.0 diff --git a/spack.yaml b/spack.yaml index b60caff7952d62ec7443a8757ee70a32b4cc1a64..ae79ad650cc585dbb4efb290f5e773f2849f9b9d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -15,8 +15,8 @@ spack: - xrootd@5.1.0 cxxstd=17 +python - root@6.22.08 cxxstd=17 +fftw +fortran +gdml +http +mlp +pythia8 - +root7 +tmva +vc +xrootd +ssl ^mesa+opengl - -llvm -osmesa + +root7 +tmva +vc +xrootd +ssl + ^mesa swr=none +opengl -llvm -osmesa - pythia8@8303 +fastjet - fastjet@3.3.3 - hepmc3@3.2.2 +python +rootio @@ -27,7 +27,7 @@ spack: - dd4hep@1.17 +geant4 +assimp +hepmc3 +ipo +lcio - acts@8.03.0p1 +dd4hep +digitization +identification +json +tgeo +ipo - genfit@2.00.00 - - gaudi@34.0 + - gaudi@36.0 - dawn@3_91a - dawncut@1_54a - opencascade@7.4.0p1