diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 4c102408..8f8d28cb 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -71,6 +71,7 @@ jobs: PLATFORM: linux/arm64 runner: ubuntu-24.04-arm arch: arm64 + fail-fast: false steps: - name: Checkout uses: actions/checkout@v4 @@ -297,6 +298,7 @@ jobs: - arch: arm64 runner: ubuntu-24.04-arm PLATFORM: linux/arm64 + fail-fast: false steps: - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@v1.3.1 diff --git a/spack-environment/ci/epic/spack.yaml b/spack-environment/ci/epic/spack.yaml index 7957e2c4..de6f5202 100644 --- a/spack-environment/ci/epic/spack.yaml +++ b/spack-environment/ci/epic/spack.yaml @@ -5,6 +5,10 @@ spack: - ../../view.yaml include_concrete: - /opt/spack-environment/ci + packages: + geant4: + require: + - ~opengl specs: - algorithms - edm4eic diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 7b5be222..6b622cb6 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -11,7 +11,12 @@ # packages: all: - require: + prefer: # is not overwritten below, but less strict than require + - '%gcc' + - +ipo + - build_system=cmake + - build_type=Release + require: # is overwritten by package-specific requirements below - '%gcc' - any_of: [+ipo, '@:'] - any_of: [build_system=cmake, '@:'] @@ -96,9 +101,9 @@ packages: - '@1.16.2:' dd4hep: require: - - '%gcc' + # ACTS requires same compiler as DD4hep since compiler options are reused - '@1.33' - - +ddg4 +ddcad +hepmc3 +xercesc + - +ddg4 +ddcad +edm4hep +hepmc3 +xercesc - any_of: [+ddeve +utilityapps, -ddeve -utilityapps] # FIXME ^root +x +opengl when +utilityapps dpmjet: require: @@ -341,6 +346,9 @@ packages: py-awkward: require: - '@2.6.6:' + py-beautifulsoup4: + require: + - '@4.12:' py-bokeh: require: - '@3.5.2:' @@ -378,6 +386,9 @@ packages: py-jsonschema: require: - +format-nongpl # non-default required for jupyter stack + py-jupyterlab: + require: + - '@4.3.5:' py-keras: require: - '@3.12:' @@ -436,6 +447,9 @@ packages: py-pyyaml: require: - '@6.0.2:' + py-rich: + require: + - '@13:' py-rucio-clients: require: - '@37.3.0:' diff --git a/spack-environment/xl/epic/spack.yaml b/spack-environment/xl/epic/spack.yaml index 677c338d..1e5d7f5d 100644 --- a/spack-environment/xl/epic/spack.yaml +++ b/spack-environment/xl/epic/spack.yaml @@ -7,6 +7,10 @@ spack: - /opt/spack-environment/xl concretizer: unify: when_possible # multiple epic versions + packages: + geant4: + require: + - +opengl specs: - algorithms - edm4eic