.gitlab-ci.yml

@@ -103,6 +103,7 @@ version:
         VERSION="unstable-mr-${CI_MERGE_REQUEST_PROJECT_ID}-${CI_MERGE_REQUEST_IID}"
         NIGHTLY_TAG="${VERSION}-nightly"
         EXPORT_TAG="${VERSION}"
+        DH_PUSH=""
       elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+\.[0-9]+\.[0-9]+ ]]; then
         VERSION="${CI_COMMIT_TAG:1}"
         EXPORT_TAG="${VERSION}"
@@ -123,6 +124,7 @@ version:
       echo "VERSION=$VERSION" >> build.env
       echo "NIGHTLY_TAG=$NIGHTLY_TAG" >> build.env
       echo "EXPORT_TAG=$EXPORT_TAG" >> build.env
+      echo "DH_PUSH=$DH_PUSH" >> build.env
       cat build.env
   artifacts:
     reports:

containers/jug/dev.Dockerfile

@@ -119,7 +119,8 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM}              \
  && make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
     SPACK_ENV=${SPACK_ENV}                                              \
     BUILDCACHE_MIRROR="local eics3rw"                                   \
- && ccache --show-stats
+ && ccache --show-stats                                                 \
+ && ccache --zero-stats
 
 ## Create view at /usr/local
 RUN --mount=type=cache,target=/var/cache/spack                          \
@@ -156,10 +157,7 @@ FROM builder as staging
 RUN spack -e ${SPACK_ENV} gc -y
 
 # Garbage collect in git
-RUN du -sh $SPACK_ROOT                                                  \
- && git -C $SPACK_ROOT fetch --depth=1                                  \
- && git -C $SPACK_ROOT gc --prune=all --aggressive                      \
- && du -sh $SPACK_ROOT
+RUN git -C $SPACK_ROOT gc --prune=all --aggressive
 
 ## Bugfix to address issues loading the Qt5 libraries on Linux kernels prior to 3.15
 ## See