From 3708f2e7528ebb03a980a688c956c3f7f8d0daca Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Wed, 26 Jun 2024 00:03:55 +0200
Subject: [PATCH] Added support for git tags suffixed with subproject name
---
scripts/bash/npm-helpers/npm_generate_version.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/scripts/bash/npm-helpers/npm_generate_version.sh b/scripts/bash/npm-helpers/npm_generate_version.sh
index 1e4a328..7f47bea 100755
--- a/scripts/bash/npm-helpers/npm_generate_version.sh
+++ b/scripts/bash/npm-helpers/npm_generate_version.sh
@@ -36,7 +36,13 @@ fi
GIT_COMMIT_TIME=$(TZ=UTC0 git show --quiet --date='format-local:%Y%m%d%H%M%S' --format="%cd")
TAG_TIME=${GIT_COMMIT_TIME:2}
-TAG=$(git tag --sort=-taggerdate | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+(-.+)?' | head -1)
+_TAG=$(git tag --sort=-taggerdate | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+(-.+)?' | head -1)
+
+echo "Read project original git tag: ${_TAG} (#${SHORT_HASH})"
+# try to skip git tag project name suffix (useful for repositories where multiple targets are published, but sometimes they need to be tagged separately at git side)
+TAG="${_TAG/\-${PROJECT_NAME}\-/}"
+
+echo "Corrected tag (skipped subproject -${PROJECT_NAME}- suffix): ${TAG}"
echo "Preparing npm packge for ${CURRENT_BRANCH}@${TAG} (#${SHORT_HASH})"
--
GitLab