From fd55a76e8ac0078a9eb3ab533068b2497e03b3fd Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 3 Sep 2020 13:02:11 -0400 Subject: [PATCH] ceph*setup: Abbreviate the tag I don't know what changed or when but `git describe` started returning a longer string. Our tooling relies on there only being 8 characters in the last portion of the version so we need to keep naming our packages that way. Signed-off-by: David Galloway --- ceph-dev-new-setup/build/build | 4 ++-- ceph-dev-setup/build/build | 4 ++-- ceph-setup/build/build | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build index b87a8ad1b..f7c2c1b75 100644 --- a/ceph-dev-new-setup/build/build +++ b/ceph-dev-new-setup/build/build @@ -26,7 +26,7 @@ if [ -x "$BRANCH" ] ; then exit 1 fi -echo "Building version $(git describe) Branch $BRANCH" +echo "Building version $(git describe --abbrev=8) Branch $BRANCH" rm -rf dist rm -rf release @@ -96,7 +96,7 @@ mkdir -p release releasedir='release' versionfile='release/version' -cephver=`git describe --match "v*" | sed s/^v//` +cephver=`git describe --abbrev=8 --match "v*" | sed s/^v//` echo current version $cephver srcdir=`pwd` diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build index 6832afe86..3700d370c 100644 --- a/ceph-dev-setup/build/build +++ b/ceph-dev-setup/build/build @@ -19,7 +19,7 @@ if [ -x "$BRANCH" ] ; then exit 1 fi -echo "Building version $(git describe) Branch $BRANCH" +echo "Building version $(git describe --abbrev=8) Branch $BRANCH" rm -rf dist rm -rf release @@ -87,7 +87,7 @@ mkdir -p release releasedir='release' versionfile='release/version' -cephver=`git describe --match "v*" | sed s/^v//` +cephver=`git describe --abbrev=8 --match "v*" | sed s/^v//` echo current version $cephver srcdir=`pwd` diff --git a/ceph-setup/build/build b/ceph-setup/build/build index 61b437b0d..7bca374cb 100644 --- a/ceph-setup/build/build +++ b/ceph-setup/build/build @@ -14,7 +14,7 @@ if [ -x "$BRANCH" ] ; then exit 1 fi -echo "Building version $(git describe) Branch $BRANCH" +echo "Building version $(git describe --abbrev=8) Branch $BRANCH" rm -rf dist rm -rf release @@ -74,7 +74,7 @@ mkdir -p release releasedir='release' versionfile='release/version' -cephver=`git describe --match "v*" | sed s/^v//` +cephver=`git describe --abbrev=8 --match "v*" | sed s/^v//` echo current version $cephver srcdir=`pwd` -- 2.47.3