Skip to content
Snippets Groups Projects

feat: allow external trigger with edm4eic version

Merged Wouter Deconinck requested to merge trigger-edm4eic into master
2 files
+ 20
10
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -163,10 +163,12 @@ EOF
@@ -163,10 +163,12 @@ 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)
## Note: these default versions are just the very first commit.
## Note: these default versions are just the very first commit.
ARG JUGGLER_VERSION="df87bf1f8643afa8e80bece9d36d6dc26dfe8132"
ARG EDM4EIC_VERSION="8aeb507f93a93257c99985efbce0ec1371e0b331"
ARG EICRECON_VERSION="28108da4a1e8919a05dfdb5f11e114800a2cbe96"
ARG EICRECON_VERSION="28108da4a1e8919a05dfdb5f11e114800a2cbe96"
ADD https://api.github.com/repos/eic/juggler/commits/${JUGGLER_VERSION} /tmp/juggler.json
ARG JUGGLER_VERSION="df87bf1f8643afa8e80bece9d36d6dc26dfe8132"
 
ADD https://api.github.com/repos/eic/edm4eic/commits/${EDM4EIC_VERSION} /tmp/edm4eic.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
 
ADD https://api.github.com/repos/eic/juggler/commits/${JUGGLER_VERSION} /tmp/juggler.json
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
--mount=type=cache,target=/var/cache/spack \
--mount=type=cache,target=/var/cache/spack \
--mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \
--mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \
@@ -175,15 +177,20 @@ source ${SPACK_ROOT}/share/spack/setup-env.sh
@@ -175,15 +177,20 @@ 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}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
if [ "${EDM4EIC_VERSION}" != "8aeb507f93a93257c99985efbce0ec1371e0b331" ] ; then
export JUGGLER_VERSION=$(jq -r .sha /tmp/juggler.json)
export EDM4EIC_VERSION=$(jq -r .sha /tmp/edm4eic.json)
spack config add "packages:juggler::require:['@git.${JUGGLER_VERSION}=main']"
spack config add "packages:edm4eic::require:['@git.${EDM4EIC_VERSION}=main']"
spack deconcretize -y juggler
spack deconcretize -y --all edm4eic
fi
fi
if [ "${EICRECON_VERSION}" != "28108da4a1e8919a05dfdb5f11e114800a2cbe96" ] ; 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}=main']"
spack config add "packages:eicrecon::require:['@git.${EICRECON_VERSION}=main']"
spack deconcretize -y eicrecon
spack deconcretize -y --all eicrecon
 
fi
 
if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
 
export JUGGLER_VERSION=$(jq -r .sha /tmp/juggler.json)
 
spack config add "packages:juggler::require:['@git.${JUGGLER_VERSION}=main']"
 
spack deconcretize -y --all juggler
fi
fi
spack concretize --fresh --force --quiet
spack concretize --fresh --force --quiet
make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
Loading