Commit c9d1b466 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

modified: .containers/Dockerfile.in

	modified:   .gitlab-ci.yml
parent 005f2f3b
Pipeline #8360 passed with stages
in 8 minutes and 53 seconds
......@@ -17,7 +17,7 @@ RUN cd /tmp \
RUN cd /tmp \
&& export CLICOLOR_FORCE=1 \
&& git clone https://eicweb.phy.anl.gov/EIC/eicd.git \
&& git clone -b @EIC_DATA_MODEL_VERSION@ https://eicweb.phy.anl.gov/EIC/eicd.git \
&& mkdir -p eicd/build && cd eicd/build \
&& cmake ../. -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=/usr/local \
&& make -j30 && make -j4 install \
......
......@@ -33,6 +33,11 @@ env:
if [ "${DETECTOR_TAG}" ]; then
echo "DETECTOR_TAG=$DETECTOR_TAG" >> juggler.env
fi
- |
if [ -z "${EIC_DATA_MODEL_VERSION}" ]; then
export EIC_DATA_MODEL_VERSION="master"
fi
echo "EIC_DATA_MODEL_VERSION=$EIC_DATA_MODEL_VERSION" >> juggler.env
artifacts:
reports:
dotenv: juggler.env
......
......@@ -23,6 +23,7 @@ TAG=$EIC_VERSION
sed "s/@EIC_TAG@/$EIC_TAG/g" $TEMPLATE_FILE | \
sed "s/@JUGGLER_TAG@/$JUGGLER_TAG/g" | \
sed "s/@EIC_DATA_MODEL_VERSION@/$EIC_DATA_MODEL_VERSION/g" | \
sed "s/@JUGGLER_BRANCH@/$JUGGLER_BRANCH/g" > ${OUTPUT_FILE}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment