Merge pull request #74 from zcash/pipeline-fixes

Zashi pipeline fixes

zashi-pipeline.py

@@ -31,9 +31,63 @@ RELEASE_MATRIX = {
     ZASHI_IOS: []
 }
 
-class TrackedIssue:
+
-    def __init__(self, issue):
+class Release:
-        self.issue = issue
+    def __init__(self, repo_id, child):
+        self.repo_id = repo_id
+
+        # Extract version number from title
+        if repo_id == RUST:
+            self.version = re.search(r'zcash_[^ ]+ \d+(\.\d+)+', child.title).group()
+        else:
+            self.version = re.search(r'\d+(\.\d+)+', child.title).group()
+
+        self.is_closed = child.state == 'closed'
+        self.url = child.url
+
+    def __repr__(self):
+        return self.version
+
+    def __eq__(self, other):
+        return (self.repo_id, self.version) == (other.repo_id, other.version)
+
+    def __hash__(self):
+        return hash((self.repo_id, self.version))
+
+
+def build_release(row, repo_id):
+    child = row.get(repo_id)
+    if child is None:
+        return None
+    else:
+        return Release(repo_id, child)
+
+
+class ReleasePipeline:
+    def __init__(self, row):
+        self.rust = build_release(row, RUST)
+        self.android_sdk = build_release(row, ANDROID_SDK)
+        self.swift_sdk = build_release(row, SWIFT_SDK)
+        self.zashi_android = build_release(row, ZASHI_ANDROID)
+        self.zashi_ios = build_release(row, ZASHI_IOS)
+
+    def __repr__(self):
+        return '%s | %s | %s | %s | %s' % self.columns()
+
+    def __eq__(self, other):
+        return self.columns() == other.columns()
+
+    def __hash__(self):
+        return hash(self.columns())
+
+    def columns(self):
+        return (
+            self.rust,
+            self.android_sdk,
+            self.swift_sdk,
+            self.zashi_android,
+            self.zashi_ios,
+        )
 
 def build_release_matrix_from(dg, issue, repo_id):
     acc = []
@@ -200,7 +254,11 @@ def main():
         f.write(html_header)
 
         for issue in tracked_issues.values():
-            rows = build_release_matrix_from(dg, issue, RUST);
+            rows = [ReleasePipeline(row) for row in build_release_matrix_from(dg, issue, RUST)]
+
+            # Deduplicate rows
+            rows = list(dict.fromkeys(rows))
+
             for i, row in enumerate(rows):
                 f.write('<tr>')
 
@@ -220,22 +278,15 @@ def main():
                         issue.title,
                     ))
 
-                for repo_id in [RUST, ANDROID_SDK, SWIFT_SDK, ZASHI_ANDROID, ZASHI_IOS]:
+                for release in row.columns():
-                    child = row.get(repo_id)
+                    if release is None:
-                    if child is None:
                         # Release not found in this repo
                         f.write('<td>📥</td>')
                     else:
-                        # Extract version number from title
-                        if repo_id == RUST:
-                            version = re.search(r'zcash_[^ ]+ \d+(\.\d+)+', child.title).group()
-                        else:
-                            version = re.search(r'\d+(\.\d+)+', child.title).group()
-
                         f.write('<td>{} <a href="{}">{}</a></td>'.format(
-                            '✅' if child.state == 'closed' else '🛑',
+                            '✅' if release.is_closed else '🛑',
-                            child.url,
+                            release.url,
-                            version,
+                            release.version,
                         ))
                 f.write('</tr>')