From d93da3bfd6193eb37a29103fdbc43ba71a278722 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 19 Dec 2023 13:54:43 +0000
Subject: [PATCH] fix: default versions of EICrecon and juggler in
packages.yaml
---
.gitlab-ci.yml | 6 +++---
spack-environment/packages.yaml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9e3a6689..ef1641be7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,10 @@ variables:
DOCKER_IMAGE: docker.io/docker:24.0.5
SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.4
- ## Application versions used for the main release
+ ## Default versions are specified in packages.yaml but can be overridden
## note: nightly builds will always use the master/main branch
- JUGGLER_VERSION: "v13.0.0"
- EICRECON_VERSION: "v1.9.0"
+ JUGGLER_VERSION: ""
+ EICRECON_VERSION: ""
## Local registry
CI_PUSH: 1
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index ca3844330..d9e482fb7 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -163,7 +163,7 @@ packages:
- -ipo +podio +root +zmq
juggler:
require:
- - '@12.0.0'
+ - '@13.0.0'
- cxxstd=20
k4actstracking:
require:
--
GitLab