diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66c266e3bc274460d3a3c2ae44dd0422ff48e5a9..411fc2bf31224d13e95cdedeac644c8d08b75dfe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,20 +4,17 @@ variables:
## Application versions used for the main release
## note: nightly builds will always use the master/main branch
JUGGLER_VERSION: "v9.0.0"
- NPDET_VERSION: "v1.3.2"
+ NPDET_VERSION: "v1.4.1"
## Spack github version, e.g. v0.18.1 or commit hash
- SPACK_VERSION: "v0.18.1"
+ SPACK_VERSION: "v0.19.0"
## Space-separated list of spack cherry-picks
- SPACK_CHERRYPICKS: "adc9f887eac78a81bb8189d603f4dc45ed3509c1 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0 afc044cbad5eb8c5ffd6efe364fb740a08623842 8bdc5065792c185be9934ab0c2a5b087b8845bd1"
+ SPACK_CHERRYPICKS: ""
## Ref: https://github.com/spack/spack/commit/[hash]
- ## adc9f887eac78a81bb8189d603f4dc45ed3509c1: acts-dd4hep: new package; acts: new version
- ## 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0: lcio, podio, edm4hep: add latest versions
- ## afc044cbad5eb8c5ffd6efe364fb740a08623842: dd4hep: add v1.21
- ## 8bdc5065792c185be9934ab0c2a5b087b8845bd1: emacs: Add option to install version 28.1
+ ## [hash]: [description]
## Spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash
- EICSPACK_VERSION: "v0.18"
+ EICSPACK_VERSION: "v0.19"
## Space-separated list of eic-spack cherry-picks
EICSPACK_CHERRYPICKS: ""
@@ -281,6 +278,9 @@ oneapi_jug_xl:default:
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
containers/oneapi
- !reference [.build, script]
+ rules:
+ - when: manual
+ allow_failure: true
oneapi_jug_xl:nightly:
extends: .build
@@ -319,6 +319,9 @@ oneapi_jug_xl:nightly:
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub ;
fi
+ rules:
+ - when: manual
+ allow_failure: true
cuda_base:default:
extends: .build
diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index afa8151cdb4dbc1411048383230db0bb5e179826..5fc63de47ecbf9f095ef8912670fffa9f82306a9 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -1,9 +1,10 @@
#syntax=docker/dockerfile:1.2
+ARG BASEIMAGE="amd64/debian:testing-20220822-slim"
# Minimal container based on Debian Testing for up-to-date packages.
# Very lightweight container with a minimal build environment
-FROM amd64/debian:testing-20220822-slim
+FROM ${BASEIMAGE}
LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="debian_base" \
march="amd64"
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 17cf1f64a068292d3d6c7c2a75b90d646782c577..894261dcd3f2864e867e14b2cb1ff10fc3b1069b 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -205,15 +205,6 @@ RUN du -sh /opt/software/linux-*/gcc-*/* | sort -h \
## and links therin for more info
RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so
-## Address Issue #72
-## missing precompiled headers for cppyy due to missing symlink in root
-## install (should really be addressed by ROOT spack package)
-RUN cd /opt/spack-environment && spack env activate . \
- && if [ ! -e $(spack location -i root)/lib/cppyy_backend/etc ]; then \
- ln -sf $(spack location -i root)/etc \
- $(spack location -i root)/lib/cppyy_backend/etc; \
- fi
-
RUN spack debug report \
| sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" \
>> /etc/jug_info \
diff --git a/containers/oneapi/base.Dockerfile b/containers/oneapi/base.Dockerfile
index b30c369751c670009f1bb0045385c52e0ab82bbb..b7a5d0122aa68d24a8291aa1e838a7897988a300 100644
--- a/containers/oneapi/base.Dockerfile
+++ b/containers/oneapi/base.Dockerfile
@@ -1,9 +1,10 @@
#syntax=docker/dockerfile:1.2
+ARG BASEIMAGE="intel/oneapi-hpckit:2022.2-devel-ubuntu20.04"
# Minimal container based on Intel oneAPI for up-to-date packages.
# Very lightweight container with a minimal build environment (LOL)
-FROM intel/oneapi-hpckit:2022.1.2-devel-ubuntu18.04
+FROM ${BASEIMAGE}
LABEL maintainer="Wouter Deconinck <wouter.deconinck@umanitoba.ca" \
name="oneapi_base" \
march="amd64"
@@ -18,8 +19,6 @@ ENV CLICOLOR_FORCE=1 \
## Install additional packages. Remove the auto-cleanup functionality
## for docker, as we're using the new buildkit cache instead.
## We also install gitlab-runner, from the buster package (as bullseye is not available atm)
-## TODO: libyaml-cpp-dev is a dependency for afterburner. We can probably remove
-## this once afterburner is added to spack
RUN --mount=type=cache,target=/var/cache/apt \
rm -f /etc/apt/apt.conf.d/docker-clean \
&& ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime \
@@ -45,7 +44,6 @@ RUN --mount=type=cache,target=/var/cache/apt \
less \
libcbor-xs-perl \
libjson-xs-perl \
- libyaml-cpp-dev \
locales \
lua-posix \
make \
diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index 18c66620683b81d894220c34ea66abb8505db954..03dfc288ad9b339abf07387bd7033b796ff9bade 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -10,10 +10,11 @@
## ========================================================================================
ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
+ARG BASEIMAGE="debian_base"
# Internal Tag will be set by GitLab CI
ARG INTERNAL_TAG="testing"
-FROM ${DOCKER_REGISTRY}debian_stable_base:${INTERNAL_TAG} as builder
+FROM ${DOCKER_REGISTRY}${BASEIMAGE}:${INTERNAL_TAG} as builder
## Install some extra spack dependencies
## Do not use Cache mount as it conflicts with oneapi stage
@@ -206,15 +207,6 @@ RUN find -L /usr/local/* \
## and links therin for more info
RUN strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so
-## Address Issue #72
-## missing precompiled headers for cppyy due to missing symlink in root
-## install (should really be addressed by ROOT spack package)
-RUN cd /opt/spack-environment && spack env activate . \
- && if [ ! -e $(spack location -i root)/lib/cppyy_backend/etc ]; then \
- ln -sf $(spack location -i root)/etc \
- $(spack location -i root)/lib/cppyy_backend/etc; \
- fi
-
RUN spack debug report \
| sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" \
>> /etc/jug_info \
diff --git a/spack.yaml b/spack.yaml
index 881d3a3d88ee412c92440e4bbc15cb33ee24c44d..ff93cccabcf34b30c3fae43813af2e3565537a13 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -1,45 +1,46 @@
spack:
specs:
- - acts@19.9.0 +dd4hep +identification +json +tgeo +ipo +examples +fatras +geant4 +python
+ - acts@19.10.0 +dd4hep +identification +json +tgeo +ipo +examples +fatras +geant4 +python
- afterburner@0.1.2 +root +zlib
- cairo@1.16.0 +fc+ft+X+pdf+gobject
- - clhep@2.4.5.1 cxxstd=17
+ - clhep@2.4.6.0 cxxstd=17
- cli11@2.1.1
- - cmake@3.23.1
+ - cmake@3.24.3
- cnpy@master
- dawn@3_91a
- dawncut@1_54a
- dd4hep@1.23 +ddg4 +ddcad +hepmc3 +ipo +lcio
- edm4eic@1.2.1 cxxstd=17 -ipo
- - edm4hep@0.6 cxxstd=17 -ipo
+ - edm4hep@0.7 cxxstd=17 -ipo
- eicrecon@0.3.5
- eigen@3.4.0
- - emacs@28.1
- - fastjet@3.3.4
+ - emacs
+ - fastjet@3.4.0
- fmt@8.1.1 +shared cxxstd=17
- - gaudi@36.7 +optional
+ - gaudi@36.7 +aida
- geant4@11.0.3 cxxstd=17 +opengl +vecgeom +x11 +qt +threads
- hepmc3@3.2.5 +python +rootio
- heppdt@2.06.01
- igprof@5.9.16
- #- imagemagick@7.0.8-7
+ - imagemagick@7.0.8-7
+ - intel-tbb@2020.3
- irt@1.0.0
- jana2@2.0.7 +root +zmq
- madx@5.08.01
- - mesa@22.0.2 +glx -llvm +opengl +opengles +osmesa
- - nlohmann-json@3.10.5
- - opencascade@7.6.0
+ - mesa@22.1.2 +glx -llvm +opengl +opengles +osmesa
+ - nlohmann-json@3.11.2
+ - opencascade@7.6.3
- pkg-config@0.29.2
- podio@0.15
- pythia8@8.306 +fastjet
- - python@3.10.4
- - py-numpy@1.22.3
- - py-pip@21.3.1
- - qt@5.15.4 +opengl
+ - python@3.10.8
+ - py-numpy@1.23.4
+ - py-pip@22.2.2
+ - qt@5.15.5 +opengl
- root@6.26.06 cxxstd=17
+fftw +fortran +gdml +http +mlp +pythia8
+root7 +tmva +vc +xrootd +ssl
- - spdlog@1.9.2
+ - spdlog@1.10.0
- stow@2.3.1
- tensorflow-lite@2.8.0 -xnnpack
- xrootd@5.3.2 cxxstd=17 +python