Changeset 225498 in webkit

Timestamp:

Dec 4, 2017 3:05:00 PM (6 years ago)

Author:

Ross Kirsling

Message:

download-latest-github-release.py should use existing release ANY time latest is not found
​https://bugs.webkit.org/show_bug.cgi?id=180293

Reviewed by Per Arne Vollan.

• Scripts/download-latest-github-release.py:

(find_latest_release):
Handle all URLErrors, not just HTTPErrors. Stop special-casing 404s.

(main):
Rearrange logic so any failure to detect a latest release falls back to an existing release. Improve logging.

(Status):
(download_release):
(load_version_info): Renamed from existing_version info.
(has_latest_release): Deleted.
Cleanup.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/download-latest-github-release.py (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-12-04  Ross Kirsling  <ross.kirsling@sony.com>
+
+        download-latest-github-release.py should use existing release ANY time latest is not found
+        https://bugs.webkit.org/show_bug.cgi?id=180293
+
+        Reviewed by Per Arne Vollan.
+
+        * Scripts/download-latest-github-release.py:
+        (find_latest_release):
+        Handle all URLErrors, not just HTTPErrors. Stop special-casing 404s.
+
+        (main):
+        Rearrange logic so any failure to detect a latest release falls back to an existing release. Improve logging.
+
+        (Status):
+        (download_release):
+        (load_version_info): Renamed from existing_version info.
+        (has_latest_release): Deleted.
+        Cleanup.
+
 2017-12-04  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Tools/Scripts/download-latest-github-release.py

@@ -47 +47 @@
     UP_TO_DATE = 1
     COULD_NOT_FIND = 2
-    USE_EXISTING_VERSION = 3
+    USING_EXISTING = 3
 
 
@@ -70 +70 @@
     try:
         response = urllib2.urlopen(request)
-    except urllib2.HTTPError, error:
-        if error.code != 404:
-            print error.code, error.reason
+    except urllib2.URLError as error:
+        print error
         return None, None
 
@@ -83 +82 @@
 
 
-def existing_version_info(version_info_path):
+def download_release(source_url, target_path):
+    with open(target_path, 'wb') as file:
+        file.write(urllib2.urlopen(source_url).read())
+
+
+def load_version_info(version_info_path):
     if not os.path.exists(version_info_path):
         return None
@@ -89 +93 @@
     with open(version_info_path) as file:
         return json.load(file)
-
-
-def has_latest_release(version_info_path, version_info):
-    return existing_version_info(version_info_path) == version_info
-
-
-def download_release(source_url, target_path):
-    with open(target_path, 'wb') as file:
-        file.write(urllib2.urlopen(source_url).read())
 
 
@@ -111 +106 @@
     version_info_path = binary_path + '.version'
 
-    print 'Seeking latest release of {} from {}...'.format(args.filename, args.repo)
+    print 'Updating {}...'.format(args.filename)
 
-    try:
-        release_url, version_info = find_latest_release(args)
+    existing_version_info = load_version_info(version_info_path)
+    if existing_version_info:
+        print 'Found existing release:', existing_version_info['tag_name']
+    else:
+        print 'No existing release found.'
 
-        if not release_url:
-            print 'No release found!'
-            return Status.COULD_NOT_FIND
+    print 'Seeking latest release from {}...'.format(args.repo)
+    release_url, latest_version_info = find_latest_release(args)
 
-        if has_latest_release(version_info_path, version_info):
-            print 'Already up-to-date:', existing_version_info(version_info_path)
-            return Status.UP_TO_DATE
+    if not latest_version_info:
+        if existing_version_info:
+            print 'Falling back to existing release!'
+            return Status.USING_EXISTING
 
-    except urllib2.URLError, error:
-        print error
+        print 'No release found!'
+        return Status.COULD_NOT_FIND
 
-        version_info = existing_version_info(version_info_path)
-        if version_info:
-            print 'Use existing version:', version_info
-            return Status.USE_EXISTING_VERSION
-        else:
-            return Status.COULD_NOT_FIND
+    print 'Found latest release:', latest_version_info['tag_name']
+
+    if latest_version_info == existing_version_info:
+        print 'Already up-to-date!'
+        return Status.UP_TO_DATE
 
     if not os.path.exists(args.output_dir):
         os.makedirs(args.output_dir)
 
-    print 'Downloading {} to {}...'.format(version_info['tag_name'], os.path.abspath(args.output_dir))
+    print 'Downloading to {}...'.format(os.path.abspath(args.output_dir))
     download_release(release_url, binary_path)
-    save_version_info(version_info_path, version_info)
+    save_version_info(version_info_path, latest_version_info)
     print 'Done!'