From dd5d14520a6fc37337f3a092ca8afc241b2fbacc Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 15 Jan 2014 21:45:30 -0700 Subject: [PATCH] release_tarball: select the "v" tags for cephver By default, Jenkins' Git plugin adds its own tag to the repository. This interferes with the versioning in release_tarball.sh One solution would be to disable the tag in the Jenkins job. Since this is not the default, that tag creation option would need to be manually disabled for every job in Jenkins that runs this script. The other option is to make the script more selective about what it considers to be cephver. This commit implements this option. Use a --match selector to "git describe" so that we're sure we're using the standard "vX.X" tags. Pipe "git describe" through "sed" instead of "cut", so that it's easier to debug what tag was selected. Signed-off-by: Ken Dreyer --- release_tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_tarball.sh b/release_tarball.sh index b4ef466c..3b3a32f6 100755 --- a/release_tarball.sh +++ b/release_tarball.sh @@ -24,7 +24,7 @@ else echo "forcing." fi -cephver=`git describe | cut -c 2-` +cephver=`git describe --match "v*" | sed s/^v//` echo current version $cephver srcdir=`pwd` -- 2.39.5