From 17f448c99b9597b55baf7da7ecd1c1c46e0d9f34 Mon Sep 17 00:00:00 2001 From: MyroTk Date: Fri, 26 Dec 2025 13:34:53 -0500 Subject: [PATCH] remove version updating --- ci/jobs/scripts/clickhouse_version.py | 20 +------------------- cmake/autogenerated_versions.txt | 10 ++++------ tests/ci/version_helper.py | 25 ------------------------- 3 files changed, 5 insertions(+), 50 deletions(-) diff --git a/ci/jobs/scripts/clickhouse_version.py b/ci/jobs/scripts/clickhouse_version.py index 3128b1a29c60..60fdd6c4dc64 100644 --- a/ci/jobs/scripts/clickhouse_version.py +++ b/ci/jobs/scripts/clickhouse_version.py @@ -38,29 +38,11 @@ def get_release_version_as_dict(cls): @classmethod def get_current_version_as_dict(cls): - version_from_file = read_versions() - try: - version = version_from_file - tweak = int( - Shell.get_output( - f"git rev-list --count {version['githash']}..HEAD", verbose=True - ) - ) - except ValueError: - # Shallow checkout - tweak = 0 - version = get_version_from_repo() - version.tweak += tweak - # relying on ClickHouseVersion to generate proper `description` and `string` with updated `tweak`` value. version = version.with_description(version.flavour) - version_dict = version.as_dict() - - # preserve githash, not sure if that is goign to be usefull, but mimics original implementation - version_dict['githash'] = version_from_file['githash'] + return version.as_dict() - return version_dict @classmethod def get_version(cls): diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt index 7ca5c639af1e..f1a7d387cd61 100644 --- a/cmake/autogenerated_versions.txt +++ b/cmake/autogenerated_versions.txt @@ -7,11 +7,9 @@ SET(VERSION_MAJOR 25) SET(VERSION_MINOR 8) SET(VERSION_PATCH 13) SET(VERSION_GITHASH 25db09bd0a09eb1576ae0ba56f6e52d9f2c4651e) -SET(VERSION_DESCRIBE v25.8.13.20000.altinitytest) -SET(VERSION_STRING 25.8.13.20000.altinitytest) +SET(VERSION_DESCRIBE v25.8.13.10001.altinitytest) +SET(VERSION_STRING 25.8.13.10001.altinitytest) # end of autochange -# This is the 'base' tweak of the version, build scripts will -# increment this by number of commits since previous tag. -SET(VERSION_TWEAK 20000) -SET(VERSION_FLAVOUR altinityantalya) +SET(VERSION_TWEAK 10001) +SET(VERSION_FLAVOUR altinitytest) diff --git a/tests/ci/version_helper.py b/tests/ci/version_helper.py index 1ab9d08092d2..67774608fba1 100755 --- a/tests/ci/version_helper.py +++ b/tests/ci/version_helper.py @@ -316,31 +316,6 @@ def get_version_from_repo( flavour=versions.get("flavour", None) ) - # if this commit is tagged, use tag's version instead of something stored in cmake - if git is not None and git.latest_tag: - version_from_tag = get_version_from_tag(git.latest_tag) - logging.debug(f'Git latest tag: {git.latest_tag} ({git.commits_since_latest} commits ago)\n' - f'"new" tag: {git.new_tag} ({git.commits_since_new})\n' - f'current commit: {git.sha}\n' - f'current brach: {git.branch}' - ) - if git.latest_tag and git.commits_since_latest == 0: - # Tag has a priority over the version written in CMake. - # Version must match (except tweak, flavour, description, etc.) to avoid accidental mess. - if not (version_from_tag.major == cmake_version.major \ - and version_from_tag.minor == cmake_version.minor \ - and version_from_tag.patch == cmake_version.patch): - raise RuntimeError(f"Version generated from tag ({version_from_tag}) should have same major, minor, and patch values as version generated from cmake ({cmake_version})") - - # Don't need to reset version completely, mostly because revision part is not set in tag, but must be preserved - logging.debug(f"Resetting TWEAK and FLAVOUR of version from cmake {cmake_version} to values from tag: {version_from_tag.tweak}.{version_from_tag._flavour}") - cmake_version._flavour = version_from_tag._flavour - cmake_version.tweak = version_from_tag.tweak - else: - # We've had some number of commits since the latest (upstream) tag. - logging.debug(f"Bumping the TWEAK of version from cmake {cmake_version} by {git.commits_since_upstream}") - cmake_version.tweak = cmake_version.tweak + git.commits_since_upstream - return cmake_version