From afcc0b0ccbc09118264412e3075ee8003bcb1dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yanis=20Gu=C3=A9rault?= <yanis.guerault@orange.com>
Date: Tue, 10 Dec 2024 08:33:09 +0000
Subject: [PATCH] fix: add Git branch slug in SNAPSHOT versions for Merge
Request
---
templates/gitlab-ci-maven.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/gitlab-ci-maven.yml b/templates/gitlab-ci-maven.yml
index 9ae117c..2f7b1a1 100644
--- a/templates/gitlab-ci-maven.yml
+++ b/templates/gitlab-ci-maven.yml
@@ -576,12 +576,12 @@ stages:
# only on a branch commit, with deploy and "SNAPSHOT with slug" enabled
function maybe_inject_slug_in_version() {
- if [[ "$CI_COMMIT_BRANCH" ]] && [[ "$MAVEN_DEPLOY_ENABLED" == "true" ]] && [[ "$MAVEN_DEPLOY_SNAPSHOT_WITH_SLUG_ENABLED" == "true" ]]
+ if [[ -z "$CI_COMMIT_TAG" ]] && [[ "$MAVEN_DEPLOY_ENABLED" == "true" ]] && [[ "$MAVEN_DEPLOY_SNAPSHOT_WITH_SLUG_ENABLED" == "true" ]]
then
# check if on non-prod branch
prod_ref_expr=${PROD_REF#/}
prod_ref_expr=${prod_ref_expr%/}
- if [[ ! "$CI_COMMIT_BRANCH" =~ $prod_ref_expr ]]
+ if [[ ! "$CI_COMMIT_REF_NAME" =~ $prod_ref_expr ]]
then
# shellcheck disable=SC2086
pom_version=$(mvn $MAVEN_CLI_OPTS $mvn_settings_opt $java_proxy_args help:evaluate -Dexpression=project.version -q -DforceStdout | tail -n 1)
--
GitLab