DownloadCargoBinaryFromGitHub: Find most recent release with assets (#…

…410) Currently, the `cargo-binstall` most recent release in the binstall repo does not actually have the binstall binary. This change allows the search to find the most recent release that has the expected binaries to handle the case when other releases might also be in release list that do not have the expected binaries. Signed-off-by: Michael Kubacki <[email protected]>
microsoft · Feb 10, 2025 · 774c2b6 · 774c2b6
1 parent 976aba5
commit 774c2b6
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/Scripts/DownloadCargoBinaryFromGitHub/DownloadCargoBinaryFromGitHub.py b/Scripts/DownloadCargoBinaryFromGitHub/DownloadCargoBinaryFromGitHub.py
@@ -41,17 +41,24 @@
     print("Failed to find a release.")
     exit(1)
 
+linux_found, windows_found = False, False
+
 # Download assets
-for asset in releases[0]['assets']:
-    name = asset['name'].lower()
-    if (("x86_64-pc-windows-msvc" in name or "x86_64-unknown-linux-gnu" in name)
-       and asset['name'].endswith(('.zip', '.tar.gz', '.tgz'))):
-        filepath = DOWNLOAD_DIR / asset['name']
-        print(f"Downloading {asset['name']}...")
-        with requests.get(asset['browser_download_url'], stream=True) as r:
-            with filepath.open('wb') as f:
-                for chunk in r.iter_content(chunk_size=8192):
-                    f.write(chunk)
+for release in releases:
+    for asset in release['assets']:
+        name = asset['name'].lower()
+        if (("x86_64-pc-windows-msvc" in name or "x86_64-unknown-linux-gnu" in name)
+        and asset['name'].endswith(('.zip', '.tar.gz', '.tgz'))):
+            linux_found = linux_found or "x86_64-unknown-linux-gnu" in name
+            windows_found = windows_found or "x86_64-pc-windows-msvc" in name
+            filepath = DOWNLOAD_DIR / asset['name']
+            print(f"Downloading {asset['name']}...")
+            with requests.get(asset['browser_download_url'], stream=True) as r:
+                with filepath.open('wb') as f:
+                    for chunk in r.iter_content(chunk_size=8192):
+                        f.write(chunk)
+    if linux_found and windows_found:
+        break
 
 # Extract files
 for filename in DOWNLOAD_DIR.iterdir():