Merge pull request #35766 from ClickHouse/resurrect_official_flag

Resurrect build hash
This commit is contained in:
alesapin 2022-03-30 19:34:19 +02:00 committed by GitHub
commit 02574bd05b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -54,6 +54,7 @@ def get_packager_cmd(
build_version: str, build_version: str,
image_version: str, image_version: str,
ccache_path: str, ccache_path: str,
official: bool,
) -> str: ) -> str:
package_type = build_config["package_type"] package_type = build_config["package_type"]
comp = build_config["compiler"] comp = build_config["compiler"]
@ -83,6 +84,9 @@ def get_packager_cmd(
if _can_export_binaries(build_config): if _can_export_binaries(build_config):
cmd += " --with-binaries=tests" cmd += " --with-binaries=tests"
if official:
cmd += " --official"
return cmd return cmd
@ -254,9 +258,11 @@ def main():
logging.info("Got version from repo %s", version.string) logging.info("Got version from repo %s", version.string)
official_flag = pr_info.number == 0
version_type = "testing" version_type = "testing"
if "release" in pr_info.labels or "release-lts" in pr_info.labels: if "release" in pr_info.labels or "release-lts" in pr_info.labels:
version_type = "stable" version_type = "stable"
official_flag = True
update_version_local(REPO_COPY, version, version_type) update_version_local(REPO_COPY, version, version_type)
@ -290,7 +296,9 @@ def main():
version.string, version.string,
image_version, image_version,
ccache_path, ccache_path,
official=official_flag,
) )
logging.info("Going to run packager with %s", packager_cmd) logging.info("Going to run packager with %s", packager_cmd)
build_clickhouse_log = os.path.join(TEMP_PATH, "build_log") build_clickhouse_log = os.path.join(TEMP_PATH, "build_log")