diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab26416ab3ce815a5da558ddcfffe3ed39eb0719..58cf91aa8a3e40cfe1edd41e1de8d5a34deafa12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,6 +59,7 @@ stages: default: before_script: + - docker version - ./gitlab-ci/docker_login.sh -u ${DH_REGISTRY_USER} -p ${DH_EICWEB_TOKEN} -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME} - ./gitlab-ci/docker_login.sh -u ${GITHUB_REGISTRY_USER} -p ${GITHUB_REGISTRY_TOKEN} @@ -355,7 +356,7 @@ jug_dev:default: if [ $FORCE_NOCACHE = 1 ]; then echo "FORCE_NOCACHE set" export CACHE_FLAG="--no-cache" - fi + fi ## Optionally build the raw builder image - test ${EXPORT_BUILDER} = 1 && docker build ${CACHE_FLAG} -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:builder-${INTERNAL_TAG} diff --git a/spack.yaml b/spack.yaml index 0b36e8c6a58e4a35ad6acfc4b3168736dee3a3b6..a68387249bff2f39c3e11543a48091135f30bcf9 100644 --- a/spack.yaml +++ b/spack.yaml @@ -9,6 +9,7 @@ spack: - dawn@3_91a - dawncut@1_54a - dd4hep@1.21 +ddg4 -ddcad +hepmc3 +ipo +lcio + - edm4eic@1.0.0 cxxstd=17 -ipo - edm4hep@0.6 cxxstd=17 -ipo - eigen@3.4.0 - emacs@28.1