From b71832b29679cda89f180c7ef868da206e2a628d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Thu, 9 Nov 2023 02:16:42 +0000 Subject: [PATCH] chore: eicrecon:acts-upgrade-26 with acts-30 --- .gitlab-ci.yml | 4 +--- containers/jug/dev.Dockerfile | 3 --- spack-environment/packages.yaml | 4 ++-- spack.sh | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 378fb83aa..1f7a4daba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,7 @@ variables: ## Application versions used for the main release ## note: nightly builds will always use the master/main branch - JUGGLER_VERSION: "v10.1.0" - EICRECON_VERSION: "v1.7.0" + EICRECON_VERSION: "acts-upgrade-26" ## Local registry CI_PUSH: 1 @@ -337,7 +336,6 @@ jug_dev: --build-arg S3_SECRET_KEY=${S3_SECRET_KEY} --build-arg JUG_VERSION=${EXPORT_TAG}-${BUILD_TYPE}-$(git rev-parse HEAD) ${IF_BUILD_DEFAULT:+ - --build-arg JUGGLER_VERSION=${JUGGLER_VERSION} --build-arg EICRECON_VERSION=${EICRECON_VERSION} } --build-arg ENV=${ENV} diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index 2f4a13dac..7601401da 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -120,8 +120,6 @@ FROM spack as builder ## Setup our custom environment (secret mount for write-enabled mirror) COPY --from=spack-environment . /opt/spack-environment/ ARG ENV=dev -ARG JUGGLER_VERSION="main" -ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json ARG EICRECON_VERSION="main" ADD https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json ENV SPACK_ENV=/opt/spack-environment/${ENV} @@ -134,7 +132,6 @@ export CCACHE_DIR=/ccache spack buildcache update-index local spack buildcache update-index eics3rw spack env activate --dir ${SPACK_ENV} -spack add juggler@git.${JUGGLER_VERSION} spack add eicrecon@git.${EICRECON_VERSION} make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw" ccache --show-stats diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 6826f3acf..9e4c54963 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -17,8 +17,8 @@ packages: - any_of: [build_type=Release, '@:'] acts: require: - - '@21.1.1' - - +dd4hep +examples +fatras +geant4 +identification +json +python +tgeo + - '@30.3.2' + - +binaries +dd4hep +examples +fatras +geant4 +identification +json +python +tgeo actsvg: require: - '@0.4.26' diff --git a/spack.sh b/spack.sh index b50182ea1..d9db7bdd1 100644 --- a/spack.sh +++ b/spack.sh @@ -31,6 +31,15 @@ df4a2457a41e7ab634e86d3148d8b22a9f433a6a eea743de461feca88fabf8c87e8fe617a368250c 29835ac3437a7f975f7fdd22fac864b3273ff7d5 581f45b63908dda8429b63c32047fd5295a95507 +cf031e83f0149cd2c43d04f877dc26cc9d9e7894 +dd747c5c4892fd0c8f6831786c2140198394cc4b +aa9eb331080a3edeb876dd80552bb59243c69783 +f0658243c06119f6d0bf9bf72b162bb7be129344 +b25f8643ff6f28d9ca0c23d4eb46aadb840683cf +c9e1e7d90c9880b158e29bf6e721065416d21b90 +537ab481670bad654225f488fb4ec92d25f148a8 +2a797f90b431d33f609dc1d92b2908f5734f4d50 +a9e78dc7d897c146b11a93fd8c0176d0e886f2b4 --- ## Ref: https://github.com/spack/spack/commit/[hash] ## [hash]: [description] @@ -57,3 +66,12 @@ eea743de461feca88fabf8c87e8fe617a368250c ## eea743de461feca88fabf8c87e8fe617a368250c: podio: Add py-tabulate as new run and test dependency ## 29835ac3437a7f975f7fdd22fac864b3273ff7d5: podio: add 0.16.6 tag and mark older releases as deprecated ## 581f45b63908dda8429b63c32047fd5295a95507: podio: Add latest tags and variants and update dependencies accordingly +## cf031e83f0149cd2c43d04f877dc26cc9d9e7894: compilers/gcc.py: support cxx{20,23}_flag +## dd747c5c4892fd0c8f6831786c2140198394cc4b: xerces-c: support variant cxxstd=20 +## aa9eb331080a3edeb876dd80552bb59243c69783: boost: support variant cxxstd=20 +## f0658243c06119f6d0bf9bf72b162bb7be129344: clhep: support variant cxxstd=20 +## b25f8643ff6f28d9ca0c23d4eb46aadb840683cf: geant4, vecgeom: support variant cxxstd=20 +## c9e1e7d90c9880b158e29bf6e721065416d21b90: acts: impose cxxstd variant on geant4 dependency +## 537ab481670bad654225f488fb4ec92d25f148a8: acts: use f-strings +## 2a797f90b431d33f609dc1d92b2908f5734f4d50: acts: add v28.1.0:30.3.2 +## a9e78dc7d897c146b11a93fd8c0176d0e886f2b4: acts: new variant +binaries when +examples -- GitLab