From f4cab18ba2a7ce4f6355b8d6d299f7ce5c69fb14 Mon Sep 17 00:00:00 2001 From: Hassan Abouelela Date: Fri, 12 Aug 2022 17:13:17 +0200 Subject: [PATCH 1/2] Use New Static Build Site API Updates the build the script to use the new API provided by the site to fetch and download artifacts. Signed-off-by: Hassan Abouelela --- docs/netlify_build.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/docs/netlify_build.py b/docs/netlify_build.py index ca8f6d2e7..1704eece7 100644 --- a/docs/netlify_build.py +++ b/docs/netlify_build.py @@ -2,31 +2,25 @@ # This script performs all the actions required to build and deploy our project on netlify # It depends on the following packages, which are set in the netlify UI: -# httpx == 0.19.0 +# httpx == 0.23.0 -import importlib +import subprocess +import sys from pathlib import Path import httpx -SCRIPT_SOURCE = "https://raw.githubusercontent.com/python-discord/site/main/static-builds/netlify_build.py" +# Clean up environment OUTPUT = Path("docs/build.py") OUTPUT.unlink(missing_ok=True) +# Download and write the build script +SCRIPT_SOURCE = "https://raw.githubusercontent.com/python-discord/site/main/static-builds/netlify_build.py" build_script = httpx.get(SCRIPT_SOURCE) build_script.raise_for_status() -OUTPUT.write_text( - build_script.text.replace( - "Build & Publish Static Preview", - "Build Docs" - ).replace( - "static-build", - "docs" - ) -) - -script = importlib.import_module(OUTPUT.name.replace(".py", "").replace("/", ".")) +OUTPUT.write_text(build_script.text, encoding="utf-8") if __name__ == "__main__": + # Run the build script print("Build started") - script.download_artifact(*script.get_build_artifact()) + subprocess.run([sys.executable, OUTPUT.absolute()]) From 690bcf27cef137724a775054ebee2274034021eb Mon Sep 17 00:00:00 2001 From: Hassan Abouelela Date: Fri, 12 Aug 2022 23:27:58 +0200 Subject: [PATCH 2/2] Delete Metadata Files After Build Signed-off-by: Hassan Abouelela --- .github/workflows/docs.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index fad707c0f..a875b9971 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -67,6 +67,11 @@ jobs: BUILD_DOCS_FOR_HEAD: ${{ github.event_name == 'pull_request' }} BRANCH_NAME: ${{ github.head_ref }} + - name: Remove Metadata Files + run: | + rm -r docs/build/**/_sources + rm -r docs/build/**/.doctrees + - name: Upload Build Artifact uses: actions/upload-artifact@v2 with: