Skip to content

Commit ebb93fb

Browse files
committed
support version flavour and tweak
1 parent 885ea91 commit ebb93fb

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

ci/jobs/scripts/clickhouse_version.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ class CHVersion:
1515
SET(VERSION_MINOR {minor})
1616
SET(VERSION_PATCH {patch})
1717
SET(VERSION_GITHASH {githash})
18+
SET(VERSION_TWEAK {tweak})
19+
SET(VERSION_FLAVOUR {flavour})
1820
SET(VERSION_DESCRIBE {describe})
1921
SET(VERSION_STRING {string})
2022
"""
@@ -31,10 +33,13 @@ def get_release_version_as_dict(cls):
3133

3234
name, value = line[4:-1].split(maxsplit=1)
3335
name = name.removeprefix("VERSION_").lower()
34-
if name in ("major", "minor", "patch"):
36+
if name in ("major", "minor", "patch", "tweak"):
3537
value = int(value)
3638
versions[name] = value
3739

40+
if versions.get("flavour"):
41+
versions["string"] = f"{versions['string']}.{versions['flavour']}"
42+
3843
result = {
3944
"major": versions["major"],
4045
"minor": versions["minor"],
@@ -43,6 +48,8 @@ def get_release_version_as_dict(cls):
4348
"githash": versions["githash"],
4449
"describe": versions["describe"],
4550
"string": versions["string"],
51+
"tweak": versions["tweak"],
52+
"flavour": versions.get("flavour", ""),
4653
}
4754
return result
4855

0 commit comments

Comments
 (0)