Issue 5996 - Release consistent versions across WebExtensions

releaseAutomation.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function
 
 import os
 import operator
 import re
 import codecs
@@ skipping 107 matching lines @@
         return continue_with_outgoing()
     return True
 
 
 def compare_versions(a, b):
     """Compare two version numbers."""
     a_digits = [int(v) for v in a.split('.')]
     b_digits = [int(v) for v in b.split('.')]
 
     def safe_get(items, index):
-        return int(items[index]) if index < len(items) else 0

[Wladimir Palant, 2017/11/28 14:04:41]

You don't need to call int() here, you converted to integer above already.

[tlucas, 2017/11/28 14:21:15]

Done.

-
-    for i in range(len(a_digits)):

[Wladimir Palant, 2017/11/28 14:04:41]

This needs to be max(len(a_digits), len(b_digits)), otherwise 1.2 and 1.2.3 will
be considered equal.

[tlucas, 2017/11/28 14:21:15]

Done.

+        return items[index] if index < len(items) else 0
+
+    for i in range(max(len(a_digits), len(b_digits))):
         result = safe_get(a_digits, i) - safe_get(b_digits, i)
         if result != 0:
             return result
     return 0
 
 
 def release_combination_is_possible(version, platforms, base_dir):
     """Determine whether a release for the given parameters is possible.
 
     Examine existing tags in order to find either higher or matching versions.
     The release is impossible if a) a higher version for a requested platform
     exists, or if b) a matching version exists and the requested set of
     platforms differs from what was already released.
     """
     def higher_tag_version(tag, version, platforms):
         return (compare_versions(tag[0], version) > 0 and
                 set(tag[1:]).intersection(platforms))
 
     def incomplete_platforms_for_version(tag, version, platforms):
         intersection = set(tag[1:]).intersection(platforms)
         return (compare_versions(tag[0], version) == 0 and
                 intersection and set(platforms) != set(tag[1:]))
 
     # only consider tags of the form "1.2[.x ...]-platform[-platform ...]
-    platform_tags = re.compile(r'^(\d+(?:(?:\.\d+)+)(?:-\w+)+)$', re.MULTILINE)

[Wladimir Palant, 2017/11/28 14:04:41]

Technically speaking, "1" is a valid version number, use * as quantifier?
\d+(?:(?:\.\d+)*)

[tlucas, 2017/11/28 14:21:15]

Good point, Done.

+    platform_tags = re.compile(r'^(\d+(?:(?:\.\d+)*)(?:-\w+)+)$', re.MULTILINE)
     tags = [
         c for c in [
             t.split('-') for t in
             platform_tags.findall(subprocess.check_output(
                 ['hg', 'tags', '-R', base_dir, '-q']))
         ] if compare_versions(c[0], version) >= 0
     ]
 
     for tag in tags:
         if higher_tag_version(tag, version, platforms):
@@ skipping 44 matching lines @@
     )
 
     packager.createBuild(base_dir, type=platform, outFile=build_path,
                          releaseBuild=True, keyFile=key_file)
 
     return build_path
 
 
 def release_commit(base_dir, extension_name, version, platforms):
     """Create a release commit with a representative message."""
-    subprocess.check_call([
+    subprocess.check_output([
         'hg', 'commit', '-R', base_dir, '-m',
         'Noissue - Releasing {} {} for {}'.format(
             extension_name, version,
-            ', '.join([p.capitalize() for p in platforms]))])
+            ', '.join([p.capitalize() for p in platforms]))],
+        stderr=subprocess.STDOUT)
 
 
 def release_tag(base_dir, tag_name, extension_name):
     """Create a tag, along with a commit message for that tag."""
     subprocess.check_call([
         'hg', 'tag', '-R', base_dir, '-f', tag_name,
         '-m', 'Noissue - Adding release tag for {} {}'.format(
             extension_name, tag_name)])
 
 
@@ skipping 38 matching lines @@
         )
 
     # Only create one commit, one tag and one source archive for all
     # platforms
     archive_path = os.path.join(
         downloads_repo,
         'adblockplus-{}-source.tgz'.format(release_identifier),
     )
     create_sourcearchive(baseDir, archive_path)
     downloads.append(archive_path)
-    if not re_release:

[Wladimir Palant, 2017/11/28 14:04:41]

This might not be a good measure. What if the release commit is backed out
before addressing an issue and re-releasing?

[tlucas, 2017/11/28 14:21:15]

Done. Replaced it with a try-except block, re-raising when we are not
re-releasing and hg returns something different then "nothing changed".

+    try:
         release_commit(baseDir, extension_name, version, target_platforms)
+    except subprocess.CalledProcessError as e:
+        if not (re_release and 'nothing changed' in e.output):
+            raise
 
     release_tag(baseDir, release_identifier, extension_name)
 
     # Now add the downloads and commit
     subprocess.check_call(['hg', 'add', '-R', downloads_repo] + downloads)
     release_commit(downloads_repo, extension_name, version, target_platforms)
 
     # Push all changes
     subprocess.check_call(['hg', 'push', '-R', baseDir])
     subprocess.check_call(['hg', 'push', '-R', downloads_repo])