Skip to content

Commit e8b1ab0

Browse files
dicejdicej
authored
update dependencies (#167)
* 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> * bump version to 0.18.0 Signed-off-by: Joel Dice <joel.dice@fermyon.com> * update python versions to use in CI Signed-off-by: Joel Dice <joel.dice@fermyon.com> * more CI updates Signed-off-by: Joel Dice <joel.dice@fermyon.com> * yet another CI fix Signed-off-by: Joel Dice <joel.dice@fermyon.com> * and yet another CI fix Signed-off-by: Joel Dice <joel.dice@fermyon.com> * how about another CI fix? Signed-off-by: Joel Dice <joel.dice@fermyon.com> * update matrix-math example to point to new numpy build Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com>
1 parent 7fa84e2 commit e8b1ab0

File tree

24 files changed

+571
-503
lines changed

24 files changed

+571
-503
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 17 additions & 18 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
@@ -31,7 +30,7 @@ jobs:
3130

3231
- uses: actions/setup-python@v5
3332
with:
34-
python-version: "3.12"
33+
python-version: "3.14.0-rc.3"
3534

3635
- name: Install latest Rust nightly toolchain
3736
uses: dtolnay/rust-toolchain@nightly
@@ -57,16 +56,16 @@ 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}.0-x86_64-linux.tar.gz
61+
mv wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux /opt/wasi-sdk
6362
6463
- name: Cache CPython
6564
id: cache-cpython-wasi
6665
uses: actions/cache@v4
6766
with:
6867
path: cpython/builddir/wasi
69-
key: cpython-wasi
68+
key: cpython-wasi-v1
7069
enableCrossOsArchive: true
7170

7271
- name: Build
@@ -85,7 +84,7 @@ jobs:
8584
os: "ubuntu-latest",
8685
arch: "amd64",
8786
maturin_target: "x86_64",
88-
wasiSDK: "linux",
87+
wasiSDK: "x86_64-linux",
8988
extension: "",
9089
buildArgs: "",
9190
target: "",
@@ -95,7 +94,7 @@ jobs:
9594
os: "ubuntu-latest",
9695
arch: "aarch64",
9796
maturin_target: "aarch64",
98-
wasiSDK: "linux",
97+
wasiSDK: "x86_64-linux",
9998
extension: "",
10099
buildArgs: "--target aarch64-unknown-linux-gnu",
101100
target: "aarch64-unknown-linux-gnu",
@@ -105,7 +104,7 @@ jobs:
105104
os: "macos-latest",
106105
arch: "amd64",
107106
maturin_target: "x86_64",
108-
wasiSDK: "macos",
107+
wasiSDK: "arm64-macos",
109108
extension: "",
110109
buildArgs: "",
111110
target: "",
@@ -115,7 +114,7 @@ jobs:
115114
os: "macos-latest",
116115
arch: "aarch64",
117116
maturin_target: "aarch64",
118-
wasiSDK: "macos",
117+
wasiSDK: "arm64-macos",
119118
extension: "",
120119
buildArgs: "--target aarch64-apple-darwin",
121120
target: "aarch64-apple-darwin",
@@ -125,7 +124,7 @@ jobs:
125124
os: "windows-latest",
126125
arch: "amd64",
127126
maturin_target: "x64",
128-
wasiSDK: "mingw",
127+
wasiSDK: "x86_64-windows",
129128
extension: ".exe",
130129
buildArgs: "",
131130
target: "",
@@ -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-rc.3"
143142

144143
- name: Install latest Rust nightly toolchain
145144
uses: dtolnay/rust-toolchain@nightly
@@ -182,25 +181,25 @@ jobs:
182181
shell: bash
183182
run: |
184183
cd /tmp
185-
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
186-
tar xf wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
184+
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
185+
tar xf wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz
187186
188187
- name: Install WASI-SDK
189188
if: runner.os != 'Windows'
190189
shell: bash
191-
run: sudo mv /tmp/wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk
190+
run: sudo mv /tmp/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }} /opt/wasi-sdk
192191

193192
- name: Install WASI-SDK on Windows
194193
if: runner.os == 'Windows'
195194
shell: bash
196-
run: echo "WASI_SDK_PATH=$(cygpath -m /tmp/wasi-sdk-${WASI_SDK_VERSION})" >> ${GITHUB_ENV}
195+
run: echo "WASI_SDK_PATH=$(cygpath -m /tmp/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }})" >> ${GITHUB_ENV}
197196

198197
- name: Restore CPython
199198
id: cache-cpython-wasi
200199
uses: actions/cache/restore@v4
201200
with:
202201
path: cpython/builddir/wasi
203-
key: cpython-wasi
202+
key: cpython-wasi-v1
204203
enableCrossOsArchive: true
205204

206205
- name: Build wheels

‎.github/workflows/test.yaml‎

Lines changed: 15 additions & 16 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-rc.3"
3332

3433
- name: Install latest Rust nightly toolchain
3534
uses: dtolnay/rust-toolchain@nightly
@@ -55,16 +54,16 @@ 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}.0-x86_64-linux.tar.gz
59+
mv wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux /opt/wasi-sdk
6160
6261
- name: Cache CPython
6362
id: cache-cpython-wasi
6463
uses: actions/cache@v4
6564
with:
6665
path: cpython/builddir/wasi
67-
key: cpython-wasi
66+
key: cpython-wasi-v1
6867
enableCrossOsArchive: true
6968

7069
- name: Build
@@ -78,9 +77,9 @@ jobs:
7877
fail-fast: false
7978
matrix:
8079
config:
81-
- { os: "ubuntu-latest", wasiSDK: "linux" }
82-
- { os: "macos-latest", wasiSDK: "macos" }
83-
- { os: "windows-latest", wasiSDK: "mingw" }
80+
- { os: "ubuntu-latest", wasiSDK: "x86_64-linux" }
81+
- { os: "macos-latest", wasiSDK: "arm64-macos" }
82+
- { os: "windows-latest", wasiSDK: "x86_64-windows" }
8483
runs-on: ${{ matrix.config.os }}
8584
steps:
8685
- name: Checkout
@@ -112,25 +111,25 @@ jobs:
112111
shell: bash
113112
run: |
114113
cd /tmp
115-
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
116-
tar xf wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
114+
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
115+
tar xf wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }}.tar.gz
117116
118117
- name: Install WASI-SDK
119118
if: runner.os != 'Windows'
120119
shell: bash
121-
run: sudo mv /tmp/wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk
120+
run: sudo mv /tmp/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }} /opt/wasi-sdk
122121

123122
- name: Install WASI-SDK on Windows
124123
if: runner.os == 'Windows'
125124
shell: bash
126-
run: echo "WASI_SDK_PATH=$(cygpath -m /tmp/wasi-sdk-${WASI_SDK_VERSION})" >> ${GITHUB_ENV}
125+
run: echo "WASI_SDK_PATH=$(cygpath -m /tmp/wasi-sdk-${WASI_SDK_VERSION}.0-${{ matrix.config.wasiSDK }})" >> ${GITHUB_ENV}
127126

128127
- name: Restore CPython
129128
id: cache-cpython-wasi
130129
uses: actions/cache/restore@v4
131130
with:
132131
path: cpython/builddir/wasi
133-
key: cpython-wasi
132+
key: cpython-wasi-v1
134133
enableCrossOsArchive: true
135134

136135
- name: Lint
@@ -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-rc.3"
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)