From f904e283d132907c6cf3be17b4bc238e6e05fac0 Mon Sep 17 00:00:00 2001 From: Sylvester Joosten <sjoosten@anl.gov> Date: Thu, 25 Nov 2021 01:18:14 +0000 Subject: [PATCH] Update software versions, and soft-update canyonlands --- .gitlab-ci.yml | 4 ++-- detectors.yaml | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2f76ba3e..a5c1bf5cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,8 @@ image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest variables: ## Application versions used for the main release ## note: nightly builds will always use the master/main branch - JUGGLER_VERSION: "v4.2.0" - NPDET_VERSION: "v1.1.0" + JUGGLER_VERSION: "v4.3.0" + NPDET_VERSION: "v1.2.0" EICD_VERSION: "v1.1.0" AFTERBURNER_VERSION: "v0.1.2" diff --git a/detectors.yaml b/detectors.yaml index 3d25cb97a..0e158d1c7 100644 --- a/detectors.yaml +++ b/detectors.yaml @@ -11,6 +11,14 @@ detectors: ip: config: ip6 version: v0.6.2 + ## this is the newer version of canyonlands. For now we give it a different name + ## to not override the ongoing production with v2.1, which could cause confusion + ## (in particular because both versions are virtually identical). + canyonlands_new: + version: canyonlands-v2.2 + ip: + config: ip6 + version: v1.0.0 nightly: version: master ip: -- GitLab