Merge pull request #48 from vais-ral/tag_version

update version tag logic
vais-ral · Mar 9, 2022 · da9cba4 · da9cba4
2 parents 831e45d + 3d56297
commit da9cba4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/jenkins-build.sh b/scripts/jenkins-build.sh
@@ -51,8 +51,8 @@ if [[ -n ${CIL_VERSION} ]]
 then
   echo Using defined version: $CIL_VERSION
 else
-  # define CIL_VERSION from last git tag, remove first char ('v') and leave rest
-  export CIL_VERSION=`git tag | xargs -I@ git log --format=format:"%at @%n" -1 @ | sort -V | awk '{print $2}' | tail -n 1 | tr -d '/s/v//g'`
+  # define CIL_VERSION from last git tag reachable from HEAD, remove first char ('v') and leave rest
+  export CIL_VERSION=`git tag --merged HEAD | xargs -I@ git log --format=format:"%at @%n" -1 @ | sort -V | awk '{print $2}' | tail -n 1 | tr -d '/s/v//g'`
 fi
 
 if [[ -z "${CIL_VERSION}" ]]