From 361eb6e115b90fb7ef82018cdc6de4c00d44e01b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dkalinkin@bnl.gov>
Date: Sat, 17 Aug 2024 00:31:15 +0000
Subject: [PATCH] feat: respect supplied versions in the nightly builds
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c01d06208..eadebb1cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ variables:
SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.5
## Default versions are specified in packages.yaml but can be overridden
- ## note: nightly builds will always use the master/main branch
EDM4EIC_VERSION: ""
EICRECON_VERSION: ""
EPIC_VERSION: ""
@@ -435,10 +434,10 @@ eic:
${JUGGLER_VERSION:+--build-arg JUGGLER_VERSION=${JUGGLER_VERSION}}
}
${IF_BUILD_NIGHTLY+
- --build-arg EDM4EIC_VERSION=main
- --build-arg EICRECON_VERSION=main
- --build-arg EPIC_VERSION=main
- --build-arg JUGGLER_VERSION=main
+ --build-arg EDM4EIC_VERSION=${EDM4EIC_VERSION:-main}
+ --build-arg EICRECON_VERSION=${EICRECON_VERSION:-main}
+ --build-arg EPIC_VERSION=${EPIC_VERSION:-main}
+ --build-arg JUGGLER_VERSION=${JUGGLER_VERSION:-main}
}
--build-arg ENV=${ENV}
--build-arg jobs=${JOBS}
--
GitLab