Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • containers/eic_container
  • wdconinc/eic_container
  • tooba/eic_container
3 results
Show changes
Commits on Source (10)
......@@ -7,8 +7,8 @@ variables:
## Application versions used for the main release
## note: nightly builds will always use the master/main branch
JUGGLER_VERSION: "v10.1.0"
EICRECON_VERSION: "v1.7.0"
JUGGLER_VERSION: "v11.0.0"
EICRECON_VERSION: "v1.8.0"
## Local registry
CI_PUSH: 1
......
......@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
EICSPACK_VERSION="1ef77b3b596e5b335366a90a16156c43a85f65c7"
EICSPACK_VERSION="1b6a01ce9081c9c1476975b90d8348e5a3522cd1"
## Space-separated list of eic-spack cherry-picks
read -r -d '' EICSPACK_CHERRYPICKS <<- \
......
......@@ -17,8 +17,8 @@ packages:
- any_of: [build_type=Release, '@:']
acts:
require:
- '@21.1.1'
- +dd4hep +examples +fatras +geant4 +identification +json +python +tgeo
- '@30.3.2'
- cxxstd=20 +binaries +dd4hep +examples +fatras +geant4 +identification +json +python +tgeo
actsvg:
require:
- '@0.4.26'
......@@ -32,7 +32,7 @@ packages:
- +root +zlib
algorithms:
require:
- '@git.ebc8f85709bc7233574843b843ee0191a5bf3c1d'
- '@git.a1e6f0def343c2ddea5df7158c52a30376099a13'
cairo:
require:
- '@1.16.0'
......@@ -48,7 +48,7 @@ packages:
clhep:
require:
- '@2.4.6.4'
- cxxstd=17
- cxxstd=20
cli11:
require:
- '@2.3.2'
......@@ -69,7 +69,7 @@ packages:
- '@1_54a'
dd4hep:
require:
- '@1.26'
- '@1.27'
- +ddg4 +ddcad +hepmc3 +xercesc
- any_of: [+ddeve, -ddeve]
dpmjet:
......@@ -81,11 +81,11 @@ packages:
edm4eic:
require:
- '@4.0.0'
- cxxstd=17
- cxxstd=20
edm4hep:
require:
- '@0.9'
- cxxstd=17
- '@0.10'
- cxxstd=20
eic-smear:
require:
- '@1.1.12'
......@@ -119,8 +119,8 @@ packages:
prefix: /opt/software/externals/g4ndl
geant4:
require:
- '@11.1.2.east'
- cxxstd=17 -vecgeom +threads -vtk
- '@11.1.3.east'
- cxxstd=20 -vecgeom +threads -vtk
- any_of: [+opengl +qt +x11, -opengl -qt -x11]
graphviz:
require:
......@@ -190,7 +190,8 @@ packages:
- '@1.0.0'
podio:
require:
- '@0.16.5'
- '@0.16.7'
- cxxstd=20
prmon:
require:
- '@3.0.2'
......@@ -198,7 +199,7 @@ packages:
pythia8:
require:
- '@8.309'
- +fastjet
- +fastjet +root
python:
require:
- '@3.10.10'
......@@ -292,8 +293,8 @@ packages:
- +opengl
root:
require:
- '@6.28.04'
- cxxstd=17 +fftw +fortran +gdml +http -ipo +mlp +pythia8 +root7 +tmva +vc +xrootd +ssl
- '@6.28.06'
- cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +root7 +tmva +vc +xrootd +ssl
- any_of: [+opengl +webgui +x, -opengl -webgui -x]
snakemake:
require:
......@@ -316,4 +317,4 @@ packages:
xrootd:
require:
- '@5.5.5'
- cxxstd=17 -davix +python +scitokens-cpp
- cxxstd=20 -davix +python +scitokens-cpp
......@@ -33,6 +33,30 @@ c17fc3c0c1ecbebcfbf57214bf2724e26e6e1883
ef4b35ea6361e83b243b375fc4e2a28cfc25bc8f
36dd3251876895167270e26b14d16181895d6ace
518da168331fd0e58c6c3a611b52507d1750b13a
5ba4a2b83a0fabbfd221328a3c96955e9395b6ca
eea743de461feca88fabf8c87e8fe617a368250c
29835ac3437a7f975f7fdd22fac864b3273ff7d5
581f45b63908dda8429b63c32047fd5295a95507
cf031e83f0149cd2c43d04f877dc26cc9d9e7894
dd747c5c4892fd0c8f6831786c2140198394cc4b
aa9eb331080a3edeb876dd80552bb59243c69783
f0658243c06119f6d0bf9bf72b162bb7be129344
b25f8643ff6f28d9ca0c23d4eb46aadb840683cf
c9e1e7d90c9880b158e29bf6e721065416d21b90
537ab481670bad654225f488fb4ec92d25f148a8
2a797f90b431d33f609dc1d92b2908f5734f4d50
a9e78dc7d897c146b11a93fd8c0176d0e886f2b4
6b51bfb713b7f9d6203b69ef79a198758c99de94
b99288dcae9fd240a6d483d8b13940e52bfd8575
3e2d1bd4133b437b10584a5e725d6fee8b5ca294
f709518916ffe11588cffa3a5821c1e49e94b8d2
6cd2241e49a393d7ac32b46064a2d2f4e53f7d86
6f248836eafbee3b2c0612d250e201d3b3a57472
5400b49ed6dc7001b1645b5d31bbcc7d830c15c2
73ad3f729e8a5206d717d9d66468a19bb11d2940
bd58801415dc0acebfd7368f66c43e50563a9891
e1373d5408170047626583916db02911585c133a
a65f13f79f617b6aa0b235aa5db612473b6d8c0e
---
## Ref: https://github.com/spack/spack/commit/[hash]
## [hash]: [description]
......@@ -62,3 +86,31 @@ ef4b35ea6361e83b243b375fc4e2a28cfc25bc8f
## 36dd3251876895167270e26b14d16181895d6ace: gaudi: new versions 36.[11-14]
## // e51748ee8f89e0d3db4e426e3d04157129a45622: zlib-api: new virtual with zlib/zlib-ng as providers
## 518da168331fd0e58c6c3a611b52507d1750b13a: Gaudi: Add a few versions and a dependency on tbb after 37.1
## 5ba4a2b83a0fabbfd221328a3c96955e9395b6ca: podio: bump minimal version of catch2
## eea743de461feca88fabf8c87e8fe617a368250c: podio: Add py-tabulate as new run and test dependency
## 29835ac3437a7f975f7fdd22fac864b3273ff7d5: podio: add 0.16.6 tag and mark older releases as deprecated
## 581f45b63908dda8429b63c32047fd5295a95507: podio: Add latest tags and variants and update dependencies accordingly
## cf031e83f0149cd2c43d04f877dc26cc9d9e7894: compilers/gcc.py: support cxx{20,23}_flag
## dd747c5c4892fd0c8f6831786c2140198394cc4b: xerces-c: support variant cxxstd=20
## aa9eb331080a3edeb876dd80552bb59243c69783: boost: support variant cxxstd=20
## f0658243c06119f6d0bf9bf72b162bb7be129344: clhep: support variant cxxstd=20
## b25f8643ff6f28d9ca0c23d4eb46aadb840683cf: geant4, vecgeom: support variant cxxstd=20
## c9e1e7d90c9880b158e29bf6e721065416d21b90: acts: impose cxxstd variant on geant4 dependency
## 537ab481670bad654225f488fb4ec92d25f148a8: acts: use f-strings
## 2a797f90b431d33f609dc1d92b2908f5734f4d50: acts: add v28.1.0:30.3.2
## a9e78dc7d897c146b11a93fd8c0176d0e886f2b4: acts: new variant +binaries when +examples
## 6b51bfb713b7f9d6203b69ef79a198758c99de94: edm4hep: Add tag for version 0.10 and deprecate older versions
## b99288dcae9fd240a6d483d8b13940e52bfd8575: edm4hep: add edm4hep to PYTHONPATH
## 3e2d1bd4133b437b10584a5e725d6fee8b5ca294: lcio: Add latest version 2.20
## f709518916ffe11588cffa3a5821c1e49e94b8d2: podio, edm4hep and lcio: add lib and lib64 to LD_LIBRARY_PATH
## 6cd2241e49a393d7ac32b46064a2d2f4e53f7d86: edm4hep: Add 0.10.1 tag and update maintainers
## 6f248836eafbee3b2c0612d250e201d3b3a57472: dd4hep: restrict podio versions
## 5400b49ed6dc7001b1645b5d31bbcc7d830c15c2: dd4hep: add LD_LIBRARY_PATH for plugins for Gaudi
## 73ad3f729e8a5206d717d9d66468a19bb11d2940: dd4hep: add patch to fix missing hits when using LCIO
## bd58801415dc0acebfd7368f66c43e50563a9891: dd4hep: fix setting LD_LIBRARY_PATH
## // Following disabled due to https://github.com/spack/spack/pull/37372
## // c7cca3aa8d11789eaee9bfc80b8417ffea511532: dd4hep: new version 1.26
## e1373d5408170047626583916db02911585c133a: dd4hep: make sure to find libraries correctly
## // a095c8113d5065bcb3d529269bc1de268df6791f: dd4hep: Add tag for version 1.27
## a65f13f79f617b6aa0b235aa5db612473b6d8c0e: root: add latest available tag