From 8cd46fab2f094284b1155b477ec5a7f44999a0e3 Mon Sep 17 00:00:00 2001 From: alesapin Date: Wed, 30 Mar 2022 19:34:19 +0200 Subject: [PATCH] Merge pull request #35766 from ClickHouse/resurrect_official_flag Resurrect build hash --- tests/ci/build_check.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py index 24af9e5194c5..2a079a603674 100644 --- a/tests/ci/build_check.py +++ b/tests/ci/build_check.py @@ -54,6 +54,7 @@ def get_packager_cmd( build_version: str, image_version: str, ccache_path: str, + official: bool, ) -> str: package_type = build_config["package_type"] comp = build_config["compiler"] @@ -83,6 +84,9 @@ def get_packager_cmd( if _can_export_binaries(build_config): cmd += " --with-binaries=tests" + if official: + cmd += " --official" + return cmd @@ -254,9 +258,11 @@ def main(): logging.info("Got version from repo %s", version.string) + official_flag = pr_info.number == 0 version_type = "testing" if "release" in pr_info.labels or "release-lts" in pr_info.labels: version_type = "stable" + official_flag = True update_version_local(REPO_COPY, version, version_type) @@ -290,7 +296,9 @@ def main(): version.string, image_version, ccache_path, + official=official_flag, ) + logging.info("Going to run packager with %s", packager_cmd) build_clickhouse_log = os.path.join(TEMP_PATH, "build_log")