diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a841eec..4c9e758 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,7 +12,7 @@ on: env: CARGO_TERM_COLOR: always - WASI_SDK_VERSION: 27 + WASI_SDK_VERSION: 30 permissions: contents: write @@ -82,11 +82,6 @@ jobs: os: "ubuntu-latest", arch: "amd64", maturin_target: "x86_64", - # As of this writing, the offical WASI-SDK x86_64-linux builds - # require a newer version of glibc than the manylinux 2_28 Maturin - # Docker build images support. That means we need to use a - # special build made using Ubuntu 18.04 here: - wasiSDK_source: "dicej", wasiSDK: "x86_64-linux", extension: "", buildArgs: "", @@ -97,7 +92,6 @@ jobs: os: "ubuntu-latest", arch: "aarch64", maturin_target: "aarch64", - wasiSDK_source: "WebAssembly", wasiSDK: "x86_64-linux", extension: "", buildArgs: "--target aarch64-unknown-linux-gnu", @@ -108,7 +102,6 @@ jobs: os: "macos-latest", arch: "amd64", maturin_target: "x86_64", - wasiSDK_source: "WebAssembly", wasiSDK: "arm64-macos", extension: "", buildArgs: "", @@ -119,7 +112,6 @@ jobs: os: "macos-latest", arch: "aarch64", maturin_target: "aarch64", - wasiSDK_source: "WebAssembly", wasiSDK: "arm64-macos", extension: "", buildArgs: "--target aarch64-apple-darwin", @@ -130,7 +122,6 @@ jobs: os: "windows-latest", arch: "amd64", maturin_target: "x64", - wasiSDK_source: "WebAssembly", wasiSDK: "x86_64-windows", extension: ".exe", buildArgs: "", @@ -188,7 +179,7 @@ jobs: shell: bash run: | cd /tmp - curl -LO https://github.com/${{ matrix.config.wasiSDK_source }}/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz + curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz tar xf wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz - name: Install WASI-SDK diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0551b7f..7fe7e71 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,7 +14,7 @@ concurrency: env: CARGO_TERM_COLOR: always - WASI_SDK_VERSION: 27 + WASI_SDK_VERSION: 30 jobs: linux: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc49574..c656d96 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ channel](https://bytecodealliance.zulipchat.com/#narrow/stream/394175-SIG-Guest- - Tools needed to build [CPython](https://github.com/python/cpython) (Make, Clang, etc.) - [Rust](https://rustup.rs/) stable 1.71 or later *and* nightly 2023-07-27 or later, including the `wasm32-wasip1` and `wasm32-unknown-unknown` targets - Note that we currently use the `-Z build-std` Cargo option to build the `componentize-py` runtime with position-independent code (which is not the default for `wasm32-wasip1`) and this requires using a recent nightly build of Rust. - + For Rust, something like this should work once you have `rustup`: ```shell @@ -38,16 +38,16 @@ First, make sure you've got all the submodules cloned. git submodule update --init --recursive ``` -Next, install WASI-SDK 27 to `/opt/wasi-sdk` (alternatively, you can specify a +Next, install WASI-SDK 30 to `/opt/wasi-sdk` (alternatively, you can specify a different location and reference it later using the `WASI_SDK_PATH` environment variable). Replace `arm64-linux` with `x86_64-linux`, `arm64-macos`, `x86_64-macos`, `arm64-windows`, or `x86_64-windows` below depending on your architecure and OS, if necessary. ```shell -curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-arm64-linux.tar.gz -tar xf wasi-sdk-27.0-arm64-linux.tar.gz -sudo mv wasi-sdk-27.0-arm64-linux /opt/wasi-sdk +curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-30/wasi-sdk-30.0-arm64-linux.tar.gz +tar xf wasi-sdk-30.0-arm64-linux.tar.gz +sudo mv wasi-sdk-30.0-arm64-linux /opt/wasi-sdk export WASI_SDK_PATH=/opt/wasi-sdk ``` diff --git a/build.rs b/build.rs index 62ad47a..6f06ba2 100644 --- a/build.rs +++ b/build.rs @@ -16,7 +16,7 @@ use { }; const ZSTD_COMPRESSION_LEVEL: i32 = 19; -const DEFAULT_SDK_VERSION: &str = "27"; +const DEFAULT_SDK_VERSION: &str = "30"; // SQLite version to build - 3.51.2 (latest as of Jan 2026) const SQLITE_VERSION: &str = "3510200";