Merge pull request #854 from Altinity/fixes/antlya-25.3_version_fix

25.3 Antalya version fix

Author: Enmk

cmake/version.cmake

@@ -3,9 +3,10 @@ include(${PROJECT_SOURCE_DIR}/cmake/autogenerated_versions.txt)
 set(VERSION_EXTRA "" CACHE STRING "")
 set(VERSION_TWEAK "" CACHE STRING "")
 
-if (VERSION_TWEAK)
-    string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_TWEAK})
-endif ()
+# NOTE(vnemkov): we rely on VERSION_TWEAK portion to be already present in VERSION_STRING
+# if (VERSION_TWEAK)
+#     string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_TWEAK})
+# endif ()
 
 if (VERSION_EXTRA)
     string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_EXTRA})
@@ -19,5 +20,5 @@ set (VERSION_STRING_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}")
 math (EXPR VERSION_INTEGER "${VERSION_PATCH} + ${VERSION_MINOR}*1000 + ${VERSION_MAJOR}*1000000")
 
 if(CLICKHOUSE_OFFICIAL_BUILD)
-    set(VERSION_OFFICIAL " (official build)")
+    set(VERSION_OFFICIAL " (altinity build)")
 endif()

src/Common/SignalHandlers.cpp

@@ -577,14 +577,14 @@ try
         }
 
         /// Advice the user to send it manually.
-        if (std::string_view(VERSION_OFFICIAL).contains("official build"))
+        if (std::string_view(VERSION_OFFICIAL).contains("altinity build"))
         {
             const auto & date_lut = DateLUT::instance();
 
             /// Approximate support period, upper bound.
             if (time(nullptr) - date_lut.makeDate(2000 + VERSION_MAJOR, VERSION_MINOR, 1) < (365 + 30) * 86400)
             {
-                LOG_FATAL(log, "Report this error to https://github.com/ClickHouse/ClickHouse/issues");
+                LOG_FATAL(log, "Report this error to https://github.com/Altinity/ClickHouse/issues");
             }
             else
             {