From be5f6abf759eca583d64769482a380bb349d7784 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sat, 17 Apr 2021 03:05:45 +0000
Subject: [PATCH] Use upstream changes to eicd
---
.gitlab-ci.yml | 8 ++++++++
util/print_env.sh | 1 +
2 files changed, 9 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bab344eb..d3f5a613 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,18 @@ image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
default:
tags:
- silicon
+ before_script:
+ - |
+ if [[ -n "${EIC_DATA_MODEL_VERISON}" ]]; then
+ echo "Triggered from upstream EICD pipeline."
+ git clone -b ${EIC_DATA_MODEL_VERSION} https://eicweb.phy.anl.gov/EIC/eicd.git
+ mkdir eicd/build && cd eicd/build && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j20 install && cd ../..
+ fi
artifacts:
expire_in: 3 days
stages:
+ - config
- initialize
- process
- collect
diff --git a/util/print_env.sh b/util/print_env.sh
index ce401050..431ab79f 100755
--- a/util/print_env.sh
+++ b/util/print_env.sh
@@ -10,3 +10,4 @@ echo "JUGGLER_INSTALL_PREFIX: ${JUGGLER_INSTALL_PREFIX}"
echo "LOCAL_PREFIX: ${LOCAL_PREFIX}"
echo "DETECTOR_PREFIX: ${DETECTOR_PREFIX}"
echo "DETECTOR_PATH: ${DETECTOR_PATH}"
+echo "EIC_DATA_MODEL_VERSION: ${EIC_DATA_MODEL_VERSION}"
--
GitLab