From dfc12f900f28aa1b81a6c4b85489ef313a122092 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 1 Sep 2022 03:54:08 +0000
Subject: [PATCH] feat: eic-spack@0.18.11, edm4eic@1.0.0
---
.gitlab-ci.yml | 3 ++-
spack.yaml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab26416ab..58cf91aa8 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 0b36e8c6a..a68387249 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
--
GitLab