Issue 4548 - Split out Safari and add Edge release automation

releaseAutomation.py

Index: releaseAutomation.py
diff --git a/releaseAutomation.py b/releaseAutomation.py
index 8625a3e802a3589f53a563a3dd720b7a658aa15b..11793839b98bc1238a997598a2da6c6c97108956 100644
--- a/releaseAutomation.py
+++ b/releaseAutomation.py
@@ -46,6 +46,10 @@ def create_sourcearchive(repo, output):
 def run(baseDir, type, version, keyFiles, downloadsRepo):
     if type == 'gecko':
         import buildtools.packagerGecko as packager
+    elif type == 'safari':
+        import buildtools.packagerSafari as packager
+    elif type == 'edge':
+        import buildtools.packagerEdge as packager
     elif type == 'chrome':
         import buildtools.packagerChrome as packager
 
@@ -87,8 +91,7 @@ def run(baseDir, type, version, keyFiles, downloadsRepo):
         packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFile)

[Wladimir Palant, 2016/10/20 10:03:08]

While at it, could you remove the keyFile parameter here? packagerGecko no
longer supports signing, it seems that we missed this in
https://issues.adblockplus.org/ticket/4336.

[kzar, 2016/10/20 12:09:36]

Done.

         downloads.append(buildPath)
     elif type == 'chrome':
-        # We actually have to create three different builds: signed and unsigned
-        # Chrome builds (the latter for Chrome Web Store), and a signed Safari build.
+        # Create both signed and unsigned Chrome builds (the latter for Chrome Web Store).
         metadata = packager.readMetadata(baseDir, type)
         buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'crx'))
         packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFiles[0])
@@ -96,12 +99,17 @@ def run(baseDir, type, version, keyFiles, downloadsRepo):
 
         buildPathUnsigned = os.path.join(baseDir, packager.getDefaultFileName(metadata, version, 'zip'))
         packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, releaseBuild=True, keyFile=None)
+    elif type == 'safari':
+        metadata = packager.readMetadata(baseDir, type)
+        buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'safariextz'))
+        packager.createBuild(baseDir, type='safari', outFile=buildPath, releaseBuild=True, keyFile=keyFiles[0])
+        downloads.append(buildPath)
+    elif type == 'edge':
+        # We only offer the Edge extension for use through the Windows Store
+        metadata = packager.readMetadata(baseDir, type)
+        buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'appx'))
+        packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, releaseBuild=True, keyFile=None)

[Sebastian Noack, 2016/10/19 14:26:14]

I suppose the absence of downloads.append(...) means that we wouldn't add the
build to the downloads repository? I wonder whether we should still add it, even
though there are some issues when installing a build that isn't signed by
Microsoft. But it's not that we don't have similar issues with off-store
extensions for Chrome and Safari. And that way, QA can at least try compare
different versions.

Even better, if we could download the build with Microsoft's signature from the
Windows Store, after unsigned build has been uploaded, and archive it in our
downloads repository. But I guess that doesn't work the way the release
automation currently works.

[kzar, 2016/10/19 14:31:03]

That's the idea. I followed the example of the unsigned Chrome builds above, but
I don't have a strong opinion on this either way.

[Sebastian Noack, 2016/10/19 15:08:24]

Sure, I just thought that it might be useful to archive the unsigned builds at
least if we don't have a signed build for Microsoft Edge. But I start to wonder
how useful this would be after all.

[Wladimir Palant, 2016/10/20 10:03:08]

This file should definitely be added to the downloads repository. We don't offer
Chrome or Firefox builds for download from our site either, these wouldn't be
usable. But we need some place to look up what we've published there. Neither
Chrome Web Store nor Windows Store will let you download historical releases, in
fact Windows Store makes it ridiculously complicated even for the current
release.

[kzar, 2016/10/20 12:09:36]

Done.

 
-        import buildtools.packagerSafari as packagerSafari
-        metadataSafari = packagerSafari.readMetadata(baseDir, 'safari')
-        buildPathSafari = os.path.join(downloadsRepo, packagerSafari.getDefaultFileName(metadataSafari, version, 'safariextz'))
-        packagerSafari.createBuild(baseDir, type='safari', outFile=buildPathSafari, releaseBuild=True, keyFile=keyFiles[1])
-        downloads.append(buildPathSafari)
 
     # Create source archive
     archivePath = os.path.splitext(buildPath)[0] + '-source.tgz'