Skip to content

Commit 998c867

Browse files
committed
update dependencies
- WASI-SDK v27 - CPython v3.14.0rc3 - Wasmtime v37.0.1 - pyo3 v0.26.0 - wasm-tools v1.239.0 - etc. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
1 parent 7fa84e2 commit 998c867

File tree

18 files changed

+523
-455
lines changed

18 files changed

+523
-455
lines changed

.github/workflows/release.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ on:
1212

1313
env:
1414
CARGO_TERM_COLOR: always
15-
WASI_SDK_VERSION: 20.46gf3a1f8991535
16-
WASI_SDK_RELEASE: wasi-sockets-alpha-5
15+
WASI_SDK_VERSION: 27
1716

1817
permissions:
1918
contents: write
@@ -57,9 +56,9 @@ jobs:
5756
shell: bash
5857
run: |
5958
cd /tmp
60-
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
61-
tar xf wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
62-
mv wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk
59+
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux.tar.gz
60+
tar xf wasi-sdk-${WASI_SDK_VERSION}-x86_64-linux.tar.gz
61+
mv wasi-sdk-${WASI_SDK_VERSION}-x86_64-linux /opt/wasi-sdk
6362
6463
- name: Cache CPython
6564
id: cache-cpython-wasi
@@ -139,7 +138,7 @@ jobs:
139138

140139
- uses: actions/setup-python@v5
141140
with:
142-
python-version: "3.12"
141+
python-version: "3.14.0-rc3"
143142

144143
- name: Install latest Rust nightly toolchain
145144
uses: dtolnay/rust-toolchain@nightly

.github/workflows/test.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ concurrency:
1414

1515
env:
1616
CARGO_TERM_COLOR: always
17-
WASI_SDK_VERSION: 20.46gf3a1f8991535
18-
WASI_SDK_RELEASE: wasi-sockets-alpha-5
17+
WASI_SDK_VERSION: 27
1918

2019
jobs:
2120
linux:
@@ -29,7 +28,7 @@ jobs:
2928

3029
- uses: actions/setup-python@v5
3130
with:
32-
python-version: "3.12"
31+
python-version: "3.14.0-rc3"
3332

3433
- name: Install latest Rust nightly toolchain
3534
uses: dtolnay/rust-toolchain@nightly
@@ -55,9 +54,9 @@ jobs:
5554
shell: bash
5655
run: |
5756
cd /tmp
58-
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
59-
tar xf wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
60-
mv wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk
57+
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux.tar.gz
58+
tar xf wasi-sdk-${WASI_SDK_VERSION}-x86_64-linux.tar.gz
59+
mv wasi-sdk-${WASI_SDK_VERSION}-x86_64-linux /opt/wasi-sdk
6160
6261
- name: Cache CPython
6362
id: cache-cpython-wasi
@@ -143,7 +142,7 @@ jobs:
143142

144143
- uses: actions/setup-python@v5
145144
with:
146-
python-version: "3.12"
145+
python-version: "3.14.0-rc3"
147146

148147
- name: Test
149148
shell: bash

CONTRIBUTING.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ channel](https://bytecodealliance.zulipchat.com/#narrow/stream/394175-SIG-Guest-
1414

1515
## Building from source
1616

17-
For the time being, we use temporary forks of `wasi-sdk` and `wasi-libc` which
18-
enable support for `wasi-sockets`. Once that support is upstreamed, we'll
19-
switch.
20-
2117
### Prerequisites
2218

2319
- Tools needed to build [CPython](https://github.com/python/cpython) (Make, Clang, etc.)
@@ -42,15 +38,16 @@ First, make sure you've got all the submodules cloned.
4238
git submodule update --init --recursive
4339
```
4440

45-
Next, install WASI SDK to `/opt/wasi-sdk` (alternatively, you can specify a
41+
Next, install WASI-SDK 27 to `/opt/wasi-sdk` (alternatively, you can specify a
4642
different location and reference it later using the `WASI_SDK_PATH` environment
47-
variable). Replace `linux` with `macos` or `mingw` (Windows) below depending on
48-
your OS.
43+
variable). Replace `arm64-linux` with `x86_64-linux`, `arm64-macos`,
44+
`x86_64-macos`, `arm64-windows`, or `x86_64-windows` below depending on your
45+
architecure and OS, if necessary.
4946

5047
```shell
51-
curl -LO https://github.com/dicej/wasi-sdk/releases/download/wasi-sockets-alpha-5/wasi-sdk-20.46gf3a1f8991535-linux.tar.gz
52-
tar xf wasi-sdk-20.46gf3a1f8991535-linux.tar.gz
53-
sudo mv wasi-sdk-20.46gf3a1f8991535 /opt/wasi-sdk
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
5451
export WASI_SDK_PATH=/opt/wasi-sdk
5552
```
5653

0 commit comments

Comments
 (0)