Skip to content

Commit 9f96496

Browse files
alexcrichtondicej
andauthored
Update to wasi-sdk-30 (#200)
* Update to wasi-sdk-30 Seeing if any issues arise... * Run rustfmt * update cpython submodule --------- Co-authored-by: Joel Dice <joel.dice@akamai.com>
1 parent 9ec2a80 commit 9f96496

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
env:
1414
CARGO_TERM_COLOR: always
15-
WASI_SDK_VERSION: 27
15+
WASI_SDK_VERSION: 30
1616

1717
permissions:
1818
contents: write
@@ -82,11 +82,6 @@ jobs:
8282
os: "ubuntu-latest",
8383
arch: "amd64",
8484
maturin_target: "x86_64",
85-
# As of this writing, the offical WASI-SDK x86_64-linux builds
86-
# require a newer version of glibc than the manylinux 2_28 Maturin
87-
# Docker build images support. That means we need to use a
88-
# special build made using Ubuntu 18.04 here:
89-
wasiSDK_source: "dicej",
9085
wasiSDK: "x86_64-linux",
9186
extension: "",
9287
buildArgs: "",
@@ -97,7 +92,6 @@ jobs:
9792
os: "ubuntu-latest",
9893
arch: "aarch64",
9994
maturin_target: "aarch64",
100-
wasiSDK_source: "WebAssembly",
10195
wasiSDK: "x86_64-linux",
10296
extension: "",
10397
buildArgs: "--target aarch64-unknown-linux-gnu",
@@ -108,7 +102,6 @@ jobs:
108102
os: "macos-latest",
109103
arch: "amd64",
110104
maturin_target: "x86_64",
111-
wasiSDK_source: "WebAssembly",
112105
wasiSDK: "arm64-macos",
113106
extension: "",
114107
buildArgs: "",
@@ -119,7 +112,6 @@ jobs:
119112
os: "macos-latest",
120113
arch: "aarch64",
121114
maturin_target: "aarch64",
122-
wasiSDK_source: "WebAssembly",
123115
wasiSDK: "arm64-macos",
124116
extension: "",
125117
buildArgs: "--target aarch64-apple-darwin",
@@ -130,7 +122,6 @@ jobs:
130122
os: "windows-latest",
131123
arch: "amd64",
132124
maturin_target: "x64",
133-
wasiSDK_source: "WebAssembly",
134125
wasiSDK: "x86_64-windows",
135126
extension: ".exe",
136127
buildArgs: "",
@@ -188,7 +179,7 @@ jobs:
188179
shell: bash
189180
run: |
190181
cd /tmp
191-
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
182+
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
192183
tar xf wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz
193184
194185
- name: Install WASI-SDK

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
env:
1616
CARGO_TERM_COLOR: always
17-
WASI_SDK_VERSION: 27
17+
WASI_SDK_VERSION: 30
1818

1919
jobs:
2020
linux:

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ channel](https://bytecodealliance.zulipchat.com/#narrow/stream/394175-SIG-Guest-
1919
- Tools needed to build [CPython](https://github.com/python/cpython) (Make, Clang, etc.)
2020
- [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
2121
- 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.
22-
22+
2323
For Rust, something like this should work once you have `rustup`:
2424

2525
```shell
@@ -38,16 +38,16 @@ First, make sure you've got all the submodules cloned.
3838
git submodule update --init --recursive
3939
```
4040

41-
Next, install WASI-SDK 27 to `/opt/wasi-sdk` (alternatively, you can specify a
41+
Next, install WASI-SDK 30 to `/opt/wasi-sdk` (alternatively, you can specify a
4242
different location and reference it later using the `WASI_SDK_PATH` environment
4343
variable). Replace `arm64-linux` with `x86_64-linux`, `arm64-macos`,
4444
`x86_64-macos`, `arm64-windows`, or `x86_64-windows` below depending on your
4545
architecure and OS, if necessary.
4646

4747
```shell
48-
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-arm64-linux.tar.gz
49-
tar xf wasi-sdk-27.0-arm64-linux.tar.gz
50-
sudo mv wasi-sdk-27.0-arm64-linux /opt/wasi-sdk
48+
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-30/wasi-sdk-30.0-arm64-linux.tar.gz
49+
tar xf wasi-sdk-30.0-arm64-linux.tar.gz
50+
sudo mv wasi-sdk-30.0-arm64-linux /opt/wasi-sdk
5151
export WASI_SDK_PATH=/opt/wasi-sdk
5252
```
5353

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use {
1616
};
1717

1818
const ZSTD_COMPRESSION_LEVEL: i32 = 19;
19-
const DEFAULT_SDK_VERSION: &str = "27";
19+
const DEFAULT_SDK_VERSION: &str = "30";
2020

2121
// SQLite version to build - 3.51.2 (latest as of Jan 2026)
2222
const SQLITE_VERSION: &str = "3510200";

0 commit comments

Comments
 (0)