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

feat: use eicd from github

parent 6df63515
No related branches found
No related tags found
1 merge request!460feat: use eicd from github
...@@ -13,6 +13,7 @@ variables: ...@@ -13,6 +13,7 @@ variables:
## to keep the container functionally identical to jug_xl:nightly ## to keep the container functionally identical to jug_xl:nightly
JUGGLER_NPDET_VERSION: "master" JUGGLER_NPDET_VERSION: "master"
JUGGLER_EICD_VERSION: "master" JUGGLER_EICD_VERSION: "master"
JUGGLER_EICD_REPOSITORYURL: "https://github.com/eic/eicd.git"
## We have: ## We have:
## - Juggler triggers eic_container on a master pipeline ## - Juggler triggers eic_container on a master pipeline
...@@ -77,8 +78,8 @@ juggler:local: ...@@ -77,8 +78,8 @@ juggler:local:
script: script:
## first install EICD to ensure the latest version, then build juggler ## first install EICD to ensure the latest version, then build juggler
- | - |
git clone https://eicweb.phy.anl.gov/eic/eicd.git /tmp/eicd git clone ${JUGGLER_EICD_REPOSITORYURL} /tmp/eicd
cd /tmp/eicd && git checkout $JUGGLER_EICD_VERSION && cd - cd /tmp/eicd && git checkout ${JUGGLER_EICD_VERSION} && cd -
cmake -B /tmp/build -S /tmp/eicd -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_INSTALL_PREFIX=/usr/local cmake -B /tmp/build -S /tmp/eicd -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_INSTALL_PREFIX=/usr/local
cmake --build /tmp/build -j40 -- install cmake --build /tmp/build -j40 -- install
rm -rf /tmp/build /tmp/eicd rm -rf /tmp/build /tmp/eicd
...@@ -145,6 +146,7 @@ juggler:default: ...@@ -145,6 +146,7 @@ juggler:default:
--build-arg INTERNAL_TAG=${EIC_DEV_TAG} --build-arg INTERNAL_TAG=${EIC_DEV_TAG}
--build-arg JUGGLER_VERSION=${CI_COMMIT_REF_NAME} --build-arg JUGGLER_VERSION=${CI_COMMIT_REF_NAME}
--build-arg NPDET_VERSION=${JUGGLER_NPDET_VERSION} --build-arg NPDET_VERSION=${JUGGLER_NPDET_VERSION}
--build-arg EICD_REPOSITORYURL=${JUGGLER_EICD_REPOSITORYURL}
--build-arg EICD_VERSION=${JUGGLER_EICD_VERSION} --build-arg EICD_VERSION=${JUGGLER_EICD_VERSION}
--build-arg DETECTOR_VERSION=${JUGGLER_DETECTOR_VERSION} --build-arg DETECTOR_VERSION=${JUGGLER_DETECTOR_VERSION}
--build-arg IP6_VERSION=${JUGGLER_IP6_VERSION} --build-arg IP6_VERSION=${JUGGLER_IP6_VERSION}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment