comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-28 22:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use tagged Spack version and build cache again

Browse source
This commit is contained in:
Matthias Krack 2025-04-05 19:31:19 +02:00
parent dd5e703438
commit fd383878a2
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ci/docker/build_deps_spack_psmp.Dockerfile
View file

@ -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}

4
tools/docker/Dockerfile.test_spack
View file

@ -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}

4
tools/docker/generate_dockerfiles.py
View file

@ -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}}