From 3ec57559300e01ed6e41d4b14aaf5422fe8a917f Mon Sep 17 00:00:00 2001
From: Michael Legleux <legleux@users.noreply.github.com>
Date: Tue, 6 Dec 2022 08:23:33 -0800
Subject: [PATCH] Implement always adding git ref to version string (#430)

Fixes #427
---
 CMakeLists.txt          | 16 +++++++++-------
 src/main/impl/Build.cpp | 12 +++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a9425b03..370738f20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,13 @@ if(NOT GIT_COMMIT_HASH)
   find_package(Git)
   if(Git_FOUND)
       execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-          OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE gch)
-      if(gch)
-          set(GIT_COMMIT_HASH "${gch}")
-          message(STATUS "Git commit: ${GIT_COMMIT_HASH}")
-          add_definitions(-DCLIO_GIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
+          OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE git-ref)
+      execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+          OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE branch)
+      if(git-ref)
+          set(BUILD "${branch}-${git-ref}")
+          message(STATUS "Build version: ${BUILD}")
+          add_definitions(-DCLIO_BUILD="${BUILD}")
       endif()
   endif()
 endif() #git
@@ -109,8 +111,8 @@ add_executable(clio_server src/main/main.cpp)
 target_link_libraries(clio_server PUBLIC clio)
 
 if(BUILD_TESTS)
-  add_executable(clio_tests 
-    unittests/RPCErrors.cpp 
+  add_executable(clio_tests
+    unittests/RPCErrors.cpp
     unittests/Backend.cpp
     unittests/Logger.cpp
     unittests/Config.cpp)
diff --git a/src/main/impl/Build.cpp b/src/main/impl/Build.cpp
index e74a6fdb4..d75af1693 100644
--- a/src/main/impl/Build.cpp
+++ b/src/main/impl/Build.cpp
@@ -13,16 +13,14 @@ namespace Build {
 //------------------------------------------------------------------------------
 // clang-format off
 char const* const versionString = "1.0.3"
-// clang-format on
+    // clang-format on
 
-#if defined(DEBUG) || defined(SANITIZER)
     "+"
-#ifdef CLIO_GIT_COMMIT_HASH
-    CLIO_GIT_COMMIT_HASH
-    "."
+#ifdef CLIO_BUILD
+    CLIO_BUILD
 #endif
 #ifdef DEBUG
-    "DEBUG"
+    ".DEBUG"
 #ifdef SANITIZER
     "."
 #endif
@@ -31,7 +29,7 @@ char const* const versionString = "1.0.3"
 #ifdef SANITIZER
     BOOST_PP_STRINGIZE(SANITIZER)
 #endif
-#endif
+
 #ifdef PKG
         "-release"
 #endif