Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: releaseAutomation.py

Issue 29718566: Issue 6339 - Don't create encrypted archives on release Base URL: https://hg.adblockplus.org/buildtools/file/7ee9ad9b9390
Patch Set: Created March 9, 2018, 9:07 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: releaseAutomation.py
diff --git a/releaseAutomation.py b/releaseAutomation.py
index 11a70c73a4558d65fd079b19e9ee51df15f49191..0fb3081accb4c77e50097c00d65a8d2af4a1cb47 100644
--- a/releaseAutomation.py
+++ b/releaseAutomation.py
@@ -193,7 +193,7 @@ def update_metadata(metadata, version):
fp.truncate()
-def create_build(platform, base_dir, target_path, version, key_file=None):
+def create_build(platform, base_dir, target_path, version):
"""Create a build for the target platform and version."""
if platform == 'edge':
import buildtools.packagerEdge as packager
@@ -205,12 +205,11 @@ def create_build(platform, base_dir, target_path, version, key_file=None):
build_path = os.path.join(
target_path,
- getDefaultFileName(metadata, version,
- get_extension(platform, key_file is not None))
+ getDefaultFileName(metadata, version, get_extension(platform))
)
packager.createBuild(base_dir, type=platform, outFile=build_path,
- releaseBuild=True, keyFile=key_file)
+ releaseBuild=True)
return build_path
@@ -233,7 +232,7 @@ def release_tag(base_dir, tag_name, extension_name):
extension_name, tag_name)])
-def run(baseDir, platforms, version, keyFile, downloads_repo):
+def run(baseDir, platforms, version, downloads_repo):
if not can_safely_release(baseDir, downloads_repo):
print('Aborting release.')
return 1
@@ -260,17 +259,8 @@ def run(baseDir, platforms, version, keyFile, downloads_repo):
extension_name = json.load(fp)['name']['message']
for platform in target_platforms:
- used_key_file = None
- if platform == 'chrome':
- # Currently, only chrome builds are provided by us as signed
- # packages. Create an unsigned package in base_dir which should be
- # uploaded to the Chrome Web Store
- create_build(platform, baseDir, baseDir, version)
- used_key_file = keyFile
-
downloads.append(
- create_build(platform, baseDir, downloads_repo, version,
- used_key_file)
+ create_build(platform, baseDir, downloads_repo, version)
)
# Only create one commit, one tag and one source archive for all
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld