From fd383878a2245ed3bf7ba36cd0d4138e0263076b Mon Sep 17 00:00:00 2001
From: Matthias Krack <matthias.krack@psi.ch>
Date: Sat, 5 Apr 2025 19:31:19 +0200
Subject: [PATCH] Use tagged Spack version and build cache again

---
 ci/docker/build_deps_spack_psmp.Dockerfile | 4 ++--
 tools/docker/Dockerfile.test_spack         | 4 ++--
 tools/docker/generate_dockerfiles.py       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/docker/build_deps_spack_psmp.Dockerfile b/ci/docker/build_deps_spack_psmp.Dockerfile
index 89ee1b0c05..1dcd9a9805 100644
--- a/ci/docker/build_deps_spack_psmp.Dockerfile
+++ b/ci/docker/build_deps_spack_psmp.Dockerfile
@@ -47,7 +47,7 @@ ENV NUM_PROCS=${NUM_PROCS:-32}
 # Install a recent Spack version
 WORKDIR /root/spack
 ARG SPACK_VERSION
-ENV SPACK_VERSION=${SPACK_VERSION:-develop}
+ENV SPACK_VERSION=${SPACK_VERSION:-develop-2025-03-23}
 RUN git init --quiet && \
     git remote add origin https://github.com/spack/spack.git && \
     git fetch --quiet --depth 1 origin ${SPACK_VERSION} --no-tags && \
@@ -62,7 +62,7 @@ RUN spack external find --all --not-buildable
 
 # Enable Spack build cache from the latest development version
 ARG SPACK_BUILD_CACHE
-ENV SPACK_BUILD_CACHE="${SPACK_BUILD_CACHE:-develop}"
+ENV SPACK_BUILD_CACHE="${SPACK_BUILD_CACHE:-develop-2025-03-23}"
 RUN spack mirror add ${SPACK_BUILD_CACHE} https://binaries.spack.io/${SPACK_BUILD_CACHE} && \
     spack buildcache keys --install --trust --force && \
     spack mirror remove ${SPACK_BUILD_CACHE}
diff --git a/tools/docker/Dockerfile.test_spack b/tools/docker/Dockerfile.test_spack
index 682a16ec64..253d68a0b5 100644
--- a/tools/docker/Dockerfile.test_spack
+++ b/tools/docker/Dockerfile.test_spack
@@ -37,7 +37,7 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
 # Install a recent Spack version
 WORKDIR /root/spack
 ARG SPACK_VERSION
-ENV SPACK_VERSION=${SPACK_VERSION:-develop}
+ENV SPACK_VERSION=${SPACK_VERSION:-develop-2025-03-23}
 RUN git init --quiet && \
     git remote add origin https://github.com/spack/spack.git && \
     git fetch --quiet --depth 1 origin ${SPACK_VERSION} --no-tags && \
@@ -52,7 +52,7 @@ RUN spack external find --all --not-buildable
 
 # Enable Spack build cache from the latest development version
 ARG SPACK_BUILD_CACHE
-ENV SPACK_BUILD_CACHE="${SPACK_BUILD_CACHE:-develop}"
+ENV SPACK_BUILD_CACHE="${SPACK_BUILD_CACHE:-develop-2025-03-23}"
 RUN spack mirror add ${SPACK_BUILD_CACHE} https://binaries.spack.io/${SPACK_BUILD_CACHE} && \
     spack buildcache keys --install --trust --force && \
     spack mirror remove ${SPACK_BUILD_CACHE}
diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py
index 84590b78fa..7001798bd0 100755
--- a/tools/docker/generate_dockerfiles.py
+++ b/tools/docker/generate_dockerfiles.py
@@ -863,7 +863,7 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
 # Install a recent Spack version
 WORKDIR /root/spack
 ARG SPACK_VERSION
-ENV SPACK_VERSION=${{SPACK_VERSION:-develop}}
+ENV SPACK_VERSION=${{SPACK_VERSION:-develop-2025-03-23}}
 RUN git init --quiet && \
     git remote add origin https://github.com/spack/spack.git && \
     git fetch --quiet --depth 1 origin ${{SPACK_VERSION}} --no-tags && \
@@ -878,7 +878,7 @@ RUN spack external find --all --not-buildable
 
 # Enable Spack build cache from the latest development version
 ARG SPACK_BUILD_CACHE
-ENV SPACK_BUILD_CACHE="${{SPACK_BUILD_CACHE:-develop}}"
+ENV SPACK_BUILD_CACHE="${{SPACK_BUILD_CACHE:-develop-2025-03-23}}"
 RUN spack mirror add ${{SPACK_BUILD_CACHE}} https://binaries.spack.io/${{SPACK_BUILD_CACHE}} && \
     spack buildcache keys --install --trust --force && \
     spack mirror remove ${{SPACK_BUILD_CACHE}}