Merge pull request #844 from Altinity/version_debug

25.3 Antalya - Some debugging regarding generated CH version

Author: Enmk

tests/ci/ci.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import argparse
 import concurrent.futures
 import json
@@ -1117,8 +1119,12 @@ def main() -> int:
         git_ref = git_runner.run(f"{GIT_PREFIX} rev-parse HEAD")
 
         # let's get CH version
-        version = get_version_from_repo(git=Git(True)).string
-        print(f"Got CH version for this commit: [{version}]")
+        git = Git(True)
+        version = get_version_from_repo(git = git).string
+        print(f"""Got CH version for this commit: [{version}]
+            latest tag: {git.latest_tag} ({git.commits_since_latest} commits back),
+            latest upstream tag: {git.latest_upstream_tag} ({git.commits_since_upstream} commits back)
+        """)
 
         docker_data = (
             _configure_docker_jobs(args.docker_digest_or_latest)

tests/ci/git_helper.py

@@ -280,8 +280,8 @@ def _update_tags(self, suppress_stderr: bool = False) -> None:
         self.latest_tag = self.run("git describe --tags --abbrev=0", stderr=stderr)
         self.commits_since_latest = self._commits_since(self.latest_tag)
 
-        latest_upstream_tag = self.run("git describe --tags --abbrev=0 --match='*-*'", stderr=stderr)
-        self.commits_since_upstream = self._commits_since(latest_upstream_tag)
+        self.latest_upstream_tag = self.run("git describe --tags --abbrev=0 --match='*-*'", stderr=stderr)
+        self.commits_since_upstream = None if not self.latest_upstream_tag else self._commits_since(self.latest_upstream_tag)
 
         if self.latest_tag.endswith("-new"):
             # We won't change the behaviour of the the "latest_tag"