Skip to content

feat: download WASI SDK from cargo build script #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

feat: download WASI SDK from cargo build script #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a8564a0
refactor: move download-wasi-sdk from Justfile into cargo build script
Sl1mb0 Nov 19, 2025
401451f
refactor: remove tarball if we dont trust it
Sl1mb0 Nov 19, 2025
b84dfa5
refactor: return error if expected folder doesn't exist
Sl1mb0 Nov 19, 2025
b96d465
refactor: avoid copying downloaded file twice
Sl1mb0 Nov 19, 2025
2b789b1
chore: formatting
Sl1mb0 Nov 19, 2025
bf62ac9
chore: please the clippy
Sl1mb0 Nov 19, 2025
d1e1233
chore: remove remnants of download-wasi-sdk recipe
Sl1mb0 Nov 19, 2025
f2f961d
docs: add comment to make need for variable explicit
Sl1mb0 Nov 19, 2025
9cb92f8
refactor: clean things up a bit, use mv instead of rename
Sl1mb0 Nov 19, 2025
44e381e
refactor: bail if WASI SDK was *not* downloaded
Sl1mb0 Nov 21, 2025
8ef1058
Merge branch 'main' into tm/cargo-build-wasi-sdk
Sl1mb0 Nov 21, 2025
11718d9
chore: remove environment variable from Justfile
Sl1mb0 Nov 21, 2025
fc7f3e7
fix: use cargo manifest dir instead for downloads
Sl1mb0 Nov 21, 2025
bc0f11d
fix: typo
Sl1mb0 Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 145 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions guests/python/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
41 changes: 1 addition & 40 deletions guests/python/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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::
Expand Down
Loading