diff options
| -rwxr-xr-x | jenkinstool | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/jenkinstool b/jenkinstool index c9655f0..ea70d2b 100755 --- a/jenkinstool +++ b/jenkinstool @@ -108,15 +108,11 @@ is_release() fi elif [ -d .git ] then - tag=$(git show-ref --tags "${project}-${version}" | - awk '{ print $1 }') - commit=$(git log -1 | awk '/^commit / { print $2 }') - if [ -n "$tag" ] && [ "$tag" = "$commit" ] - then - return 0 - else - return 1 - fi + case $(git name-rev --tags --name-only HEAD) in + "${project}-${version}^0") return 0 ;; # annotated tag + "${project}-${version}") return 0 ;; # plain tag + *) return 1 ;; + esac else echo "Unknown version control system" 1>&2 exit 1 |