Fix package upload (#576)

make_package.py

@@ -31,7 +31,7 @@ common.sign = "sign" in args.targets
 common.deploy = "deploy" in args.targets
 common.version = args.version if (args.version is not None) else utils.get_env("PRODUCT_VERSION", "1.0.0")
 common.build = args.build if (args.build is not None) else utils.get_env("BUILD_NUMBER", "1")
-common.channel = utils.get_env("RELEASE_CHANNEL", "other")
+common.channel = utils.get_env("BUILD_CHANNEL", "other")
 common.branding = args.branding
 common.timestamp = utils.get_timestamp()
 common.summary = []

scripts/package_core.py

@@ -40,7 +40,7 @@ def make_core():
 
   utils.log_h2("core deploy")
   args = ["aws", "s3", "cp", "--acl", "public-read", "--no-progress",
-          core_7z, "s3://" + common.s3_bucket + "/" + dest_version + "core.7z"]
+          core_7z, "s3://" + branding.s3_bucket + "/" + dest_version + "core.7z"]
   if common.os_family == "windows":
     rc = utils.cmd(*args, verbose=True)
   else:
@@ -49,8 +49,8 @@ def make_core():
     utils.add_deploy_data("core", "Archive", core_7z, dest_version + "core.7z")
     args = ["aws", "s3", "sync", "--delete",
             "--acl", "public-read", "--no-progress",
-            "s3://" + common.s3_bucket + "/" + dest_version,
-            "s3://" + common.s3_bucket + "/" + dest_latest]
+            "s3://" + branding.s3_bucket + "/" + dest_version,
+            "s3://" + branding.s3_bucket + "/" + dest_latest]
     if common.os_family == "windows":
       rc = utils.cmd(*args, verbose=True)
     else:

scripts/package_desktop.py

@@ -419,9 +419,8 @@ def make_dmg():
 
   if rc == 0:
     utils.log_h2("desktop dmg deploy")
-    dmg_file = utils.glob_file("build/*.dmg")
     rc = aws_s3_upload(
-        [dmg_file],
+        utils.glob_path("build/*.dmg"),
         "mac/%s/%s/%s/" % (suffix, common.version, common.build),
         "Disk Image")
   utils.set_summary("desktop msi deploy", rc == 0)
@@ -507,16 +506,16 @@ def make_sparkle_updates():
   utils.log_h2("desktop sparkle files deploy")
   rc = aws_s3_upload(
       [macos_zip] \
-      + utils.glob_files("build/update/*.delta") \
-      + utils.glob_files("build/update/*.xml") \
-      + utils.glob_files("build/update/*.html"),
+      + utils.glob_path("build/update/*.delta") \
+      + utils.glob_path("build/update/*.xml") \
+      + utils.glob_path("build/update/*.html"),
       "mac/%s/%s/%s/" % (suffix, common.version, common.build),
       "Sparkle")
   utils.set_summary("desktop sparkle files deploy", rc == 0)
 
   utils.log_h2("desktop checksums deploy")
   rc = aws_s3_upload(
-      utils.glob_files("build/update/*.txt"),
+      utils.glob_path("build/update/*.txt"),
       "mac/%s/%s/%s/" % (suffix, common.version, common.build),
       "Checksums")
   utils.set_summary("desktop checksums deploy", rc == 0)
@@ -593,7 +592,7 @@ def make_linux():
     if not branding.onlyoffice:
       utils.log_h2("desktop deb-astra deploy")
       rc = aws_s3_upload(
-          utils.glob_file("deb-astra/*.deb"),
+          utils.glob_path("deb-astra/*.deb"),
           "linux/astra/",
           "Astra Linux Signed")
       utils.set_summary("desktop deb-astra deploy", rc == 0)

scripts/package_server.py

@@ -56,7 +56,7 @@ def make_windows(edition):
   if rc == 0:
     utils.log_h2("server " + edition + " inno deploy")
     rc = aws_s3_upload(
-        utils.glob_file("exe/*.exe"),
+        utils.glob_path("exe/*.exe"),
         "win/inno/%s/" % common.channel,
         edition,
         "Installer")
@@ -93,7 +93,7 @@ def make_linux(edition):
   if rc == 0:
     utils.log_h2("server " + edition + " tar deploy")
     rc = aws_s3_upload(
-        utils.glob_file("*.tar.gz"),
+        utils.glob_path("*.tar.gz"),
         "linux/generic/%s/" % common.channel,
         edition,
         "Portable")
@@ -101,7 +101,7 @@ def make_linux(edition):
 
     utils.log_h2("server " + edition + " deb deploy")
     rc = aws_s3_upload(
-        utils.glob_file("deb/*.deb"),
+        utils.glob_path("deb/*.deb"),
         "linux/debian/%s/" % common.channel,
         edition,
         "Debian")
@@ -109,7 +109,7 @@ def make_linux(edition):
 
     utils.log_h2("server " + edition + " rpm deploy")
     rc = aws_s3_upload(
-        utils.glob_file("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
+        utils.glob_path("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
         "linux/rhel/%s/" % common.channel,
         edition,
         "CentOS")
@@ -117,7 +117,7 @@ def make_linux(edition):
 
     utils.log_h2("server " + edition + " apt-rpm deploy")
     rc = aws_s3_upload(
-        utils.glob_file("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
+        utils.glob_path("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm"),
         "linux/altlinux/%s/" % common.channel,
         edition,
         "ALT Linux")