From 41e5f53c45b3af623beaf55391a79826d0168e6b Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 1 Dec 2022 01:18:26 +0300 Subject: [PATCH] Fix package upload (#577) --- scripts/package_builder.py | 2 +- scripts/package_core.py | 2 +- scripts/package_desktop.py | 2 +- scripts/package_mobile.py | 2 +- scripts/package_server.py | 2 +- scripts/package_utils.py | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/package_builder.py b/scripts/package_builder.py index f9922f6..11d4e2e 100644 --- a/scripts/package_builder.py +++ b/scripts/package_builder.py @@ -31,7 +31,7 @@ def aws_s3_upload(files, key, ptype=None): verbose=True) if rc == 0 and ptype is not None: if key.endswith("/"): key += utils.get_basename(file) - utils.add_deploy_data("builder", ptype, file, key) + utils.add_deploy_data("builder", ptype, file, key, branding.s3_bucket, branding.s3_region) return rc def make_windows(): diff --git a/scripts/package_core.py b/scripts/package_core.py index 2cb0879..51310d8 100644 --- a/scripts/package_core.py +++ b/scripts/package_core.py @@ -46,7 +46,7 @@ def make_core(): else: rc = utils.sh(" ".join(args), verbose=True) if rc == 0: - utils.add_deploy_data("core", "Archive", core_7z, dest_version + "core.7z") + utils.add_deploy_data("core", "Archive", core_7z, dest_version + "core.7z", branding.s3_bucket, branding.s3_region) args = ["aws", "s3", "sync", "--delete", "--acl", "public-read", "--no-progress", "s3://" + branding.s3_bucket + "/" + dest_version, diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index a1cee3d..a0b84ac 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -34,7 +34,7 @@ def aws_s3_upload(files, key, ptype=None): verbose=True) if rc == 0 and ptype is not None: if key.endswith("/"): key += utils.get_basename(file) - utils.add_deploy_data("desktop", ptype, file, key) + utils.add_deploy_data("desktop", ptype, file, key, branding.s3_bucket, branding.s3_region) return rc # diff --git a/scripts/package_mobile.py b/scripts/package_mobile.py index b3a0fe7..f473334 100644 --- a/scripts/package_mobile.py +++ b/scripts/package_mobile.py @@ -33,7 +33,7 @@ def make_mobile(): + zip_file + " s3://" + branding.s3_bucket + "/" + s3_key, verbose=True) if rc == 0: - utils.add_deploy_data("mobile", "Android", zip_file, s3_key) + utils.add_deploy_data("mobile", "Android", zip_file, s3_key, branding.s3_bucket, branding.s3_region) utils.set_summary("mobile deploy", rc == 0) utils.set_cwd(common.workspace_dir) diff --git a/scripts/package_server.py b/scripts/package_server.py index 0a47ea5..53f4b16 100644 --- a/scripts/package_server.py +++ b/scripts/package_server.py @@ -30,7 +30,7 @@ def aws_s3_upload(files, key, edition, ptype=None): verbose=True) if rc == 0 and ptype is not None: if key.endswith("/"): key += utils.get_basename(file) - utils.add_deploy_data("server_" + edition, ptype, file, key) + utils.add_deploy_data("server_" + edition, ptype, file, key, branding.s3_bucket, branding.s3_region) return rc def make_windows(edition): diff --git a/scripts/package_utils.py b/scripts/package_utils.py index 150750b..60d46aa 100644 --- a/scripts/package_utils.py +++ b/scripts/package_utils.py @@ -258,15 +258,15 @@ def set_summary(target, status): common.summary.append({target: status}) return -def add_deploy_data(product, ptype, src, dst): +def add_deploy_data(product, ptype, src, dst, bucket, region): common.deploy_data.append({ "platform": common.platforms[common.platform]["title"], "product": product, "type": ptype, # "local": get_path(src), "size": get_file_size(get_path(src)), - "bucket": branding.s3_bucket, - "region": branding.s3_region, + "bucket": bucket, + "region": region, "key": dst }) file = open(get_path(common.workspace_dir + "/deploy.json"), 'w')