Skip to content

Commit d130ef3

Browse files
committed
Properly set version of the produced binaries
1 parent d6fb6f0 commit d130ef3

1 file changed

Lines changed: 7 additions & 17 deletions

File tree

tests/ci/build_check.py

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,13 @@ def main():
262262
version._flavour = version_type
263263
logging.info("Using version from tag: %s => %s", tag_name, version)
264264

265+
# NOTE(vnemkov): make sure that version is set correctly for the generated binaries
266+
update_version_local(version, version_type)
267+
268+
logging.info(f"Updated local files with version : {version.string} / {version.describe}")
269+
270+
logging.info("Build short name %s", build_name)
271+
265272
release_or_pr, performance_pr = get_release_or_pr(pr_info, version)
266273

267274
s3_path_prefix = "/".join((release_or_pr, pr_info.sha, build_name))
@@ -279,23 +286,6 @@ def main():
279286
docker_image = get_image_with_version(IMAGES_PATH, IMAGE_NAME, version=pr_info.docker_image_tag)
280287
image_version = docker_image.version
281288

282-
logging.info("Got version from repo %s", version.string)
283-
284-
official_flag = True
285-
# version._flavour = version_type = CLICKHOUSE_STABLE_VERSION_SUFFIX
286-
# TODO (vnemkov): right now we'll use simplified version management:
287-
# only update git hash and explicitly set stable version suffix.
288-
# official_flag = pr_info.number == 0
289-
# version_type = "testing"
290-
# if "release" in pr_info.labels or "release-lts" in pr_info.labels:
291-
# version_type = CLICKHOUSE_STABLE_VERSION_SUFFIX
292-
# official_flag = True
293-
# update_version_local(version, version_type)
294-
295-
logging.info(f"Updated local files with version : {version.string} / {version.describe}")
296-
297-
logging.info("Build short name %s", build_name)
298-
299289
build_output_path = temp_path / build_name
300290
build_output_path.mkdir(parents=True, exist_ok=True)
301291
cargo_cache = CargoCache(

0 commit comments

Comments
 (0)