Remove unannotated tags

Groestlcoin · Dec 20, 2020 · 60c0572 · 60c0572
1 parent c67b681
commit 60c0572
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/contrib/gitian-descriptors/assign_DISTNAME b/contrib/gitian-descriptors/assign_DISTNAME
@@ -4,7 +4,7 @@
 #
 # A helper script to be sourced into the gitian descriptors
 
-#if RECENT_TAG="$(git describe --tags HEAD)"; then
+#if RECENT_TAG="$(git describe HEAD)"; then
 #    VERSION="${RECENT_TAG#v}"
 #else
 #    VERSION="$(git rev-parse --short=12 HEAD)"

diff --git a/share/genbuild.sh b/share/genbuild.sh
@@ -25,7 +25,7 @@ if [ "${GROESTLCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] &&
     git diff >/dev/null 2>/dev/null
 
     # if latest commit is tagged and not dirty, then override using the tag name
-    RAWDESC=$(git describe --tags --abbrev=0 2>/dev/null)
+    RAWDESC=$(git describe --abbrev=0 2>/dev/null)
     if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then
         git diff-index --quiet HEAD -- && GIT_TAG=$RAWDESC
     fi

diff --git a/src/clientversion.cpp b/src/clientversion.cpp
@@ -31,9 +31,9 @@ const std::string CLIENT_NAME("Groestlcoin");
     #define BUILD_SUFFIX ""
 #else
     #define BUILD_DESC "v" STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) \
-                       "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
+                       "." STRINGIZE(CLIENT_VERSION_REVISION)
     #ifdef BUILD_GIT_COMMIT
-        #define BUILD_SUFFIX "-" BUILD_GIT_COMMIT
+        #define BUILD_SUFFIX
     #elif defined(GIT_COMMIT_ID)
         #define BUILD_SUFFIX "-g" GIT_COMMIT_ID
     #else