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

fix: use real commit for default versions

parent 46e2edc0
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !747. Comments created here will be created in the context of that merge request.
...@@ -143,8 +143,9 @@ ccache --zero-stats ...@@ -143,8 +143,9 @@ ccache --zero-stats
EOF EOF
## 2. Setup our environment with custom versions (on top of cached layer) ## 2. Setup our environment with custom versions (on top of cached layer)
ARG JUGGLER_VERSION="0" ## Note: these default versions are just the very first commit.
ARG EICRECON_VERSION="0" ARG JUGGLER_VERSION="df87bf1f8643afa8e80bece9d36d6dc26dfe8132"
ARG EICRECON_VERSION="28108da4a1e8919a05dfdb5f11e114800a2cbe96"
ADD https://api.github.com/repos/eic/juggler/commits/${JUGGLER_VERSION} /tmp/juggler.json ADD https://api.github.com/repos/eic/juggler/commits/${JUGGLER_VERSION} /tmp/juggler.json
ADD https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json ADD https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
...@@ -155,11 +156,11 @@ source $SPACK_ROOT/share/spack/setup-env.sh ...@@ -155,11 +156,11 @@ source $SPACK_ROOT/share/spack/setup-env.sh
export CCACHE_DIR=/ccache export CCACHE_DIR=/ccache
spack buildcache update-index eics3rw spack buildcache update-index eics3rw
spack env activate --dir ${SPACK_ENV} spack env activate --dir ${SPACK_ENV}
if [ "${JUGGLER_VERSION}" != "0" ] ; then if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
export JUGGLER_VERSION=$(jq -r .sha /tmp/juggler.json) export JUGGLER_VERSION=$(jq -r .sha /tmp/juggler.json)
spack config add "packages:juggler::require:['@git.${JUGGLER_VERSION}']" spack config add "packages:juggler::require:['@git.${JUGGLER_VERSION}']"
fi fi
if [ "${EICRECON_VERSION}" != "0" ] ; then if [ "${EICRECON_VERSION}" != "28108da4a1e8919a05dfdb5f11e114800a2cbe96" ] ; then
export EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json) export EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json)
spack config add "packages:eicrecon::require:['@git.${EICRECON_VERSION}']" spack config add "packages:eicrecon::require:['@git.${EICRECON_VERSION}']"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment