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

fix: use GitHub API link for juggler (handles slash branch names)

parent 63a431de
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !805. Comments created here will be created in the context of that merge request.
...@@ -127,7 +127,7 @@ FROM spack as builder ...@@ -127,7 +127,7 @@ FROM spack as builder
COPY --from=spack-environment . /opt/spack-environment/ COPY --from=spack-environment . /opt/spack-environment/
ARG ENV=dev ARG ENV=dev
ARG JUGGLER_VERSION="main" ARG JUGGLER_VERSION="main"
ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/commits/${JUGGLER_VERSION} /tmp/juggler.json ADD https://api.github.com/repos/eic/juggler/commits/${JUGGLER_VERSION} /tmp/juggler.json
ARG EICRECON_VERSION="main" ARG EICRECON_VERSION="main"
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
ENV SPACK_ENV=/opt/spack-environment/${ENV} ENV SPACK_ENV=/opt/spack-environment/${ENV}
...@@ -138,7 +138,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ ...@@ -138,7 +138,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
set -e set -e
export CCACHE_DIR=/ccache export CCACHE_DIR=/ccache
find /var/cache/spack/blobs/sha256/ -atime +7 -delete find /var/cache/spack/blobs/sha256/ -atime +7 -delete
JUGGLER_VERSION=$(jq -r .id /tmp/juggler.json) JUGGLER_VERSION=$(jq -r .sha /tmp/juggler.json)
EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json) EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json)
spack buildcache update-index eics3rw spack buildcache update-index eics3rw
spack env activate --dir ${SPACK_ENV} spack env activate --dir ${SPACK_ENV}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment