Merge pull request #184 from influxdata/tm/cargo-build-wasi-sdk

feat: download WASI SDK from cargo build script

Author: Sl1mb0

Cargo.lock

@@ -18,7 +18,10 @@ uuid.workspace = true
 wasip2.workspace = true
 
 [build-dependencies]
+flate2 = "1.0.35"
+sha2 = "0.10.8"
 tar.workspace = true
+ureq = "2.12.1"
 walkdir = "2.5.0"
 
 [lints]

guests/python/Cargo.toml

@@ -24,8 +24,6 @@ export PYO3_CROSS_LIB_DIR := DOWNLOADS_DIR / "python-sdk"
 PYTHON_TMP_VENV := DOWNLOADS_DIR / "venv"
 PYTHON_SITE_PACKAGES := PYO3_CROSS_LIB_DIR / "lib" / "python" + PYO3_CROSS_PYTHON_VERSION / "site-packages"
 
-export WASI_SDK_LINK_PATH := DOWNLOADS_DIR / "wasi-sysroot" / "lib" / "wasm32-wasip2"
-
 # download pre-built Python WASM SDK
 [private]
 download-python-sdk:
@@ -85,43 +83,6 @@ download-python-sdk:
     set +x
     echo ::endgroup::
 
-# download WASI SDK because we need some libraries during the static linking phase
-[private]
-download-wasi-sdk:
-    #!/usr/bin/env bash
-    set -euo pipefail
-
-    echo ::group::guests::python::download-wasi-sdk
-    set -x
-
-    mkdir -p downloads
-    pushd downloads >/dev/null
-
-    # skip if already downloaded
-    if [ -d wasi-sysroot ]; then
-        echo "wasi sdk already present"
-        set +x
-        echo ::endgroup::
-        exit 0
-    fi
-
-    curl \
-        --fail \
-        --show-error \
-        --silent \
-        --proto '=https' \
-        --tlsv1.2 \
-        --location \
-        --output "wasi-sysroot.tar.gz" \
-        "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-{{WASI_SDK_VERSION_MAJOR}}/wasi-sysroot-{{WASI_SDK_VERSION_MAJOR}}.{{WASI_SDK_VERSION_MINOR}}.tar.gz"
-
-    echo "{{SHA256_WASI_SDK_SYSROOT}} wasi-sysroot.tar.gz" | sha256sum -c
-    tar xf wasi-sysroot.tar.gz
-    mv wasi-sysroot-{{WASI_SDK_VERSION_MAJOR}}.{{WASI_SDK_VERSION_MINOR}} wasi-sysroot
-
-    set +x
-    echo ::endgroup::
-
 [private]
 python-site-packages: download-python-sdk
     #!/usr/bin/env bash
@@ -158,7 +119,7 @@ python-site-packages: download-python-sdk
     echo ::endgroup::
 
 [private]
-build-lib profile: download-python-sdk download-wasi-sdk python-site-packages
+build-lib profile: download-python-sdk python-site-packages
     @echo ::group::guests::python::build-lib {{profile}}
     cargo build --target=wasm32-wasip2 --profile={{replace(profile, "debug", "dev")}}
     @echo ::endgroup::