Skip to content
Snippets Groups Projects
Commit 735e05aa authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: reconcretize in stage 2

parent bdda212f
No related branches found
No related tags found
No related merge requests found
...@@ -128,7 +128,7 @@ EOF ...@@ -128,7 +128,7 @@ EOF
## ======================================================================================== ## ========================================================================================
FROM spack as builder FROM spack as builder
## Setup our custom environment (secret mount for write-enabled mirror) ## 1. Setup our default environment (secret mount for write-enabled mirror)
COPY --from=spack-environment . /opt/spack-environment/ COPY --from=spack-environment . /opt/spack-environment/
ARG ENV=dev ARG ENV=dev
ENV SPACK_ENV=/opt/spack-environment/${ENV} ENV SPACK_ENV=/opt/spack-environment/${ENV}
...@@ -146,7 +146,7 @@ ccache --show-stats ...@@ -146,7 +146,7 @@ ccache --show-stats
ccache --zero-stats ccache --zero-stats
EOF EOF
## Setup our custom environment with custom versions (on top of cached layer) ## 2. Setup our environment with custom versions (on top of cached layer)
ARG JUGGLER_VERSION="" ARG JUGGLER_VERSION=""
ARG EICRECON_VERSION="" ARG EICRECON_VERSION=""
ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json
...@@ -166,6 +166,7 @@ fi ...@@ -166,6 +166,7 @@ fi
if [ -n ${EICRECON_VERSION} ] ; then if [ -n ${EICRECON_VERSION} ] ; then
spack rm eicrecon && spack add eicrecon@git.${EICRECON_VERSION} spack rm eicrecon && spack add eicrecon@git.${EICRECON_VERSION}
fi fi
spack concretize --force --fresh
make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw" 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 ccache --zero-stats
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment