Uses Nightly To Download Artifacts

Signed-off-by: Hassan Abouelela <[email protected]>

2 files changed, 15 insertions, 15 deletions

diff --git a/static-builds/README.md b/static-builds/README.md
index fe24df07..b5cba896 100644
--- a/static-builds/README.md
+++ b/static-builds/README.md
@@ -27,6 +27,8 @@ Both output their builds to a `build/` directory.
 
 > Warning: If you are modifying the [build script](./netlify_build.py), make sure it is compatible with Python 3.8.
 
+Note: The build script uses [nightly.link](https://github.com/oprypin/nightly.link)
+to fetch the artifact with no verification.
 
 ### Deploying To Netlify
 To deploy to netlify, link your site GitHub repository to a netlify site, and use the following settings:
@@ -39,7 +41,6 @@ Publish Directory:
 
 Environment Variables:
 - PYTHON_VERSION: 3.8
-- TOKEN: A GitHub token with access to download build artifacts.
 
 
 Note that at this time, if you are deploying to netlify yourself, you won't have access to the
diff --git a/static-builds/netlify_build.py b/static-builds/netlify_build.py
index 5699c3e4..4e1e6106 100644
--- a/static-builds/netlify_build.py
+++ b/static-builds/netlify_build.py
@@ -3,16 +3,12 @@
 # WARNING: This file must remain compatible with python 3.8
 
 # This script performs all the actions required to build and deploy our project on netlify
-# It requires the following environment variable:
-
-# TOKEN: A GitHub access token that can download the artifact.
-#        For PAT, the only scope needed is `public_repos`
-
 # It depends on the following packages, which are set in the netlify UI:
 # httpx == 0.19.0
 
 import os
 import time
+import typing
 import zipfile
 from pathlib import Path
 from urllib import parse
@@ -20,11 +16,16 @@ from urllib import parse
 import httpx
 
 API_URL = "https://api.github.com"
+NIGHTLY_URL = "https://nightly.link"
 OWNER, REPO = parse.urlparse(os.getenv("REPOSITORY_URL")).path.lstrip("/").split("/")[0:2]
 
 
-def get_build_artifact() -> str:
-    """Search for a build artifact, and return the download URL."""
+def get_build_artifact() -> typing.Tuple[int, str]:
+    """
+    Search for a build artifact, and return the result.
+
+    The return is a tuple of the check suite ID, and the URL to the artifacts.
+    """
     print("Fetching build URL.")
 
     if os.getenv("PULL_REQUEST").lower() == "true":
@@ -74,7 +75,7 @@ def get_build_artifact() -> str:
 
         else:
             print(f"Found artifact URL:\n{run['artifacts_url']}")
-            return run["artifacts_url"]
+            return run["check_suite_id"], run["artifacts_url"]
 
         _run = httpx.get(run["url"])
         _run.raise_for_status()
@@ -83,7 +84,7 @@ def get_build_artifact() -> str:
     raise Exception("Polled for the artifact workflow, but it was not ready in time.")
 
 
-def download_artifact(url: str) -> None:
+def download_artifact(suite_id: int, url: str) -> None:
     """Download a build artifact from `url`, and unzip the content."""
     print("Fetching artifact data.")
 
@@ -101,9 +102,8 @@ def download_artifact(url: str) -> None:
     else:
         raise Exception("Could not find an artifact with the expected name.")
 
-    zipped_content = httpx.get(artifact["archive_download_url"], headers={
-        "Authorization": f"token {os.getenv('TOKEN')}"
-    })
+    artifact_url = f"{NIGHTLY_URL}/{OWNER}/{REPO}/suites/{suite_id}/artifacts/{artifact['id']}"
+    zipped_content = httpx.get(artifact_url)
     zipped_content.raise_for_status()
 
     zip_file = Path("temp.zip")
@@ -119,5 +119,4 @@ def download_artifact(url: str) -> None:
 
 if __name__ == "__main__":
     print("Build started")
-    artifact_url = get_build_artifact()
-    download_artifact(artifact_url)
+    download_artifact(*get_build_artifact())