From 58e7cdc6e48d98c0edeb36d0ea7a5f55b245b696 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Mon, 21 Nov 2022 00:05:47 +0000 Subject: [PATCH] feat: install npsim instead of NPDet --- .gitlab-ci.yml | 3 --- containers/jug/xl.Dockerfile | 14 +------------- spack.yaml | 1 + 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bb4bcc37..c1f77083e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: ## Application versions used for the main release ## note: nightly builds will always use the master/main branch JUGGLER_VERSION: "v9.0.0" - NPDET_VERSION: "v1.4.1" ## Spack github version, e.g. v0.18.1 or commit hash SPACK_VERSION: "v0.19.0" @@ -289,7 +288,6 @@ jug_xl:default: --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg INTERNAL_TAG=${INTERNAL_TAG} --build-arg JUGGLER_VERSION=${JUGGLER_VERSION} - --build-arg NPDET_VERSION=${NPDET_VERSION} --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) containers/jug - !reference [.build, script] @@ -427,7 +425,6 @@ juggler:main: variables: TRIGGERED_BY_NIGHTLY: 1 JUGGLER_VERSION: main - NPDET_VERSION: master DETECTOR_VERSION: master IP6_VERSION: master trigger: diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile index 1acfad436..635c16b78 100644 --- a/containers/jug/xl.Dockerfile +++ b/containers/jug/xl.Dockerfile @@ -11,25 +11,13 @@ FROM ${DOCKER_REGISTRY}${BASE_IMAGE}:${INTERNAL_TAG} ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects" ARG JUGGLER_VERSION="main" -ARG NPDET_VERSION="master" ## version will automatically bust cache for nightly, as it includes ## the date ARG JUG_VERSION=1 -ADD ${EICWEB}/18/repository/tree?ref=${NPDET_VERSION} /tmp/18.json RUN cd /tmp \ - && echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info \ - && echo "INSTALLING NPDET" \ - && git config --global http.version HTTP/1.1 \ - && git clone -b ${NPDET_VERSION} --depth 1 \ - https://eicweb.phy.anl.gov/EIC/NPDet.git \ - && cmake -B build -S NPDet -DCMAKE_CXX_STANDARD=17 \ - && cmake --build build -j12 -- install \ - && pushd NPDet \ - && echo " - NPDet: ${NPDET_VERSION}-$(git rev-parse HEAD)">> /etc/jug_info \ - && popd \ - && rm -rf build NPDet + && echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info ADD ${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json RUN cd /tmp \ diff --git a/spack.yaml b/spack.yaml index 0098bfbba..58a339768 100644 --- a/spack.yaml +++ b/spack.yaml @@ -30,6 +30,7 @@ spack: - madx@5.08.01 - mesa@22.1.2 +glx -llvm +opengl +opengles +osmesa - nlohmann-json@3.11.2 + - npsim@1.1.0 +geocad +http - opencascade@7.6.3 - pkg-config@0.29.2 - podio@0.15 -- GitLab