From 3f23adebeb6935ce606b641733ff6aed55bc056e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 4 Dec 2024 16:41:24 -0500
Subject: [PATCH] fix: geometry version shouldn't require to include suffix
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e48806395..c3a75f8b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,9 +122,10 @@ version:
elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+\.[0-9]+\.[0-9]+ ]]; then
VERSION="${CI_COMMIT_TAG:1}"
EXPORT_TAG="${VERSION}"
+ GEOM_VERSION="$(echo "$VERSION" | sed -e 's/-.\+$//')" # cut out suffixes like -stable
for ENV_FILE in spack-environment/xl/spack.yaml spack-environment/cuda/spack.yaml; do
- grep -- "- epic@${VERSION}" "${ENV_FILE}" >/dev/null \
- || ( echo "Unable to locate epic release package for ${VERSION} in ${ENV_FILE}"; exit 1; )
+ grep -- "- epic@${GEOM_VERSION}" "${ENV_FILE}" >/dev/null \
+ || ( echo "Unable to locate epic release package for ${GEOM_VERSION} in ${ENV_FILE}"; exit 1; )
done
elif [[ "$CI_COMMIT_BRANCH" =~ ^v[0-9.]+\.[0-9]+-\(alpha\|beta\|stable\) ]]; then
VERSION="${CI_COMMIT_BRANCH:1}"
--
GitLab