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

fix: use default version arg 0 so it resolves stable json from api

parent 90292b60
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,8 @@ ccache --zero-stats
EOF
## 2. Setup our environment with custom versions (on top of cached layer)
ARG JUGGLER_VERSION=""
ARG EICRECON_VERSION=""
ARG JUGGLER_VERSION="0"
ARG EICRECON_VERSION="0"
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
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
......@@ -155,11 +155,11 @@ source $SPACK_ROOT/share/spack/setup-env.sh
export CCACHE_DIR=/ccache
spack buildcache update-index eics3rw
spack env activate --dir ${SPACK_ENV}
if [ -n ${JUGGLER_VERSION} ] ; then
if [ "${JUGGLER_VERSION}" != "0" ] ; then
export JUGGLER_VERSION=$(jq -r .sha /tmp/juggler.json)
spack config add "packages:juggler::require:['@git.${JUGGLER_VERSION}']"
fi
if [ -n ${EICRECON_VERSION} ] ; then
if [ "${EICRECON_VERSION}" != "0" ] ; then
export EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json)
spack config add "packages:eicrecon::require:['@git.${EICRECON_VERSION}']"
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment