thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33597 from ClickHouse/fix-latest-build-links

Browse Source 
Restore existing static builds links
This commit is contained in:
Mikhail f. Shiryaev 2022-01-13 14:33:44 +01:00 committed by GitHub
commit f1b216cac3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/ci/build_check.py
View File

@ -186,19 +186,16 @@ def upload_master_static_binaries(
s3_helper: S3Helper, s3_helper: S3Helper,
build_output_path: str, build_output_path: str,
): ):
static_binary_name = build_config.get("static_binary_name", False)
"""Upload binary artifacts to a static S3 links""" """Upload binary artifacts to a static S3 links"""
if pr_info.number != 0: if pr_info.number != 0:
return return
elif build_config["package_type"] != "binary": elif not static_binary_name:
return
elif build_config["splitted"] == "splitted":
return return
elif pr_info.base_ref != "master": elif pr_info.base_ref != "master":
return return
s3_path = "/".join( s3_path = "/".join((pr_info.base_ref, static_binary_name, "clickhouse"))
(pr_info.base_ref, os.path.basename(build_output_path), "clickhouse")
)
binary = os.path.join(build_output_path, "clickhouse") binary = os.path.join(build_output_path, "clickhouse")
url = s3_helper.upload_build_file_to_s3(binary, s3_path) url = s3_helper.upload_build_file_to_s3(binary, s3_path)
print(f"::notice ::Binary static URL: {url}") print(f"::notice ::Binary static URL: {url}")

6
tests/ci/ci_config.py
View File

@ -104,6 +104,7 @@ CI_CONFIG = {
"build_type": "", "build_type": "",
"sanitizer": "", "sanitizer": "",
"package_type": "binary", "package_type": "binary",
"static_binary_name": "amd64",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"tidy": "disable", "tidy": "disable",
@ -114,6 +115,7 @@ CI_CONFIG = {
"build_type": "debug", "build_type": "debug",
"sanitizer": "", "sanitizer": "",
"package_type": "binary", "package_type": "binary",
"static_binary_name": "debug-amd64",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"tidy": "enable", "tidy": "enable",
@ -134,6 +136,7 @@ CI_CONFIG = {
"build_type": "", "build_type": "",
"sanitizer": "", "sanitizer": "",
"package_type": "binary", "package_type": "binary",
"static_binary_name": "macos",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"tidy": "disable", "tidy": "disable",
@ -144,6 +147,7 @@ CI_CONFIG = {
"build_type": "", "build_type": "",
"sanitizer": "", "sanitizer": "",
"package_type": "binary", "package_type": "binary",
"static_binary_name": "aarch64",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"tidy": "disable", "tidy": "disable",
@ -154,6 +158,7 @@ CI_CONFIG = {
"build_type": "", "build_type": "",
"sanitizer": "", "sanitizer": "",
"package_type": "binary", "package_type": "binary",
"static_binary_name": "freebsd",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"tidy": "disable", "tidy": "disable",
@ -164,6 +169,7 @@ CI_CONFIG = {
"build_type": "", "build_type": "",
"sanitizer": "", "sanitizer": "",
"package_type": "binary", "package_type": "binary",
"static_binary_name": "macos-aarch64",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"tidy": "disable", "tidy": "disable",