From 60b0eaad53198547f338542c5032a34daf056a2b Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Wed, 21 Mar 2018 11:14:16 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Utiliser=20git=20describe=20pour=20r=C3=A9c?= =?UTF-8?q?up=C3=A9rer=20le=20tag=20en=20fonction=20de=20la=20branche=20ac?= =?UTF-8?q?tive.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref #4 --- hooks/prebuild/debian/create-changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hooks/prebuild/debian/create-changelog b/hooks/prebuild/debian/create-changelog index 1cf2423..6d6b2b4 100755 --- a/hooks/prebuild/debian/create-changelog +++ b/hooks/prebuild/debian/create-changelog @@ -15,7 +15,8 @@ tamarin_debug "BUILD TAG IS ${BUILD_TAG}" if [[ ${BUILD_TAG} == "last" ]] then - tags=$(git tag master -l "release/*" | tr '_' '-' | sort -rV) + #tags=$(git tag master -l "release/*" | tr '_' '-' | sort -rV) + tags=$(git describe --match "release/*" --abbrev=0) else tagbranch="build-tag-${BUILD_TAG}" git checkout -b ${tagbranch} From 1c146441fb6364d7e8aa9292b7c8ac0ea39ffff7 Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Wed, 21 Mar 2018 11:14:16 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Utiliser=20git=20describe=20pour=20r=C3=A9c?= =?UTF-8?q?up=C3=A9rer=20le=20tag=20en=20fonction=20de=20la=20branche=20ac?= =?UTF-8?q?tive.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ref #4 --- hooks/prebuild/debian/create-changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/hooks/prebuild/debian/create-changelog b/hooks/prebuild/debian/create-changelog index 6d6b2b4..496ba8d 100755 --- a/hooks/prebuild/debian/create-changelog +++ b/hooks/prebuild/debian/create-changelog @@ -15,7 +15,6 @@ tamarin_debug "BUILD TAG IS ${BUILD_TAG}" if [[ ${BUILD_TAG} == "last" ]] then - #tags=$(git tag master -l "release/*" | tr '_' '-' | sort -rV) tags=$(git describe --match "release/*" --abbrev=0) else tagbranch="build-tag-${BUILD_TAG}"