feat: acts +svg

Author: wdconinc

.gitlab-ci.yml

@@ -417,7 +417,8 @@ eic:
       cat mirrors.yaml.in | envsubst > mirrors.yaml
     - attempts=0
     - nocache=""
-    - while !
+    - set -o xtrace ; 
+      while !
       docker buildx build --push ${BUILD_OPTIONS} ${nocache}
                    --cache-from type=registry,ref=${CI_REGISTRY}/${CI_PROJECT_PATH}/buildcache:${BUILD_IMAGE}${ENV}-${BUILD_TYPE}-${CI_COMMIT_REF_SLUG}-amd64
                    --cache-from type=registry,ref=${GH_REGISTRY}/${GH_REGISTRY_USER}/buildcache:${BUILD_IMAGE}${ENV}-${BUILD_TYPE}-${CI_COMMIT_REF_SLUG}-amd64

containers/eic/Dockerfile

@@ -47,6 +47,7 @@ ENV SPACK_ENV=/opt/spack-environment/${ENV}
 ARG SPACK_FLAGS="--backtrace"
 ARG SPACK_INSTALL_FLAGS="--no-check-signature --show-log-on-error --yes-to-all"
 ENV SPACK_COLOR="always"
+ENV GIT_TERMINAL_PROMPT=0
 
 # Concretization (default environment)
 RUN <<EOF

spack-environment/packages.yaml

@@ -20,11 +20,11 @@ packages:
     require:
     - '%clang'
     - '@39.2.0'
-    - cxxstd=20 +dd4hep ~edm4hep +examples +fatras +geant4 +json +onnx +podio +python +tgeo +pr4496 +pr4502 +pr4620
+    - cxxstd=20 +dd4hep ~edm4hep +examples +fatras +geant4 +json +onnx +podio +python +svg +tgeo +pr4496 +pr4502 +pr4620
   actsvg:
     require:
-    - '@0.4.26'
-    - +examples
+    - '@0.4.56'
+    - ~examples  # +examples is fixed in actsvg@0.4.57
   acts-dd4hep:
     require:
     - '@1.0.1'

spack-packages.sh

@@ -40,6 +40,7 @@ a3f3a80e2877645c72cca0381c820307fe1d4523
 559789f67245a40306aeea636b61348e97d4f092
 95c45b6c3322e151fd29ed00ea10567b97705ee4
 d6f99b8d611cf740eb45e13df2c84044a4ca6ae4
+bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
@@ -80,4 +81,5 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
 ## a3f3a80e2877645c72cca0381c820307fe1d4523: py-numba: fix python dependency bounds
 ## 559789f67245a40306aeea636b61348e97d4f092: estarlight: add thru v1.2.0
 ## 95c45b6c3322e151fd29ed00ea10567b97705ee4: py-tensorflow: modify cuDNN dependency versions when +cuda
-## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda
+## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda
+## bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa: actsvg: patch version numbers into source source