Skip to content

upgrades WASI-SDK #140

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

Closed
wants to merge 3 commits into from
Closed

upgrades WASI-SDK #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c6a230
init
Jan 13, 2025
731a48c
upgrades release and test versions of wasi-sdk
Jan 13, 2025
cc77b8c
to wasm32-wasip2
Jan 13, 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
14 changes: 7 additions & 7 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ on:

env:
CARGO_TERM_COLOR: always
WASI_SDK_VERSION: 20.46gf3a1f8991535
WASI_SDK_RELEASE: wasi-sockets-alpha-5
WASI_SDK_VERSION: 25.0
WASI_SDK_RELEASE: wasi-sdk-25

permissions:
contents: write
Expand All @@ -36,12 +36,12 @@ jobs:
- name: Install latest Rust nightly toolchain
uses: dtolnay/rust-toolchain@nightly
with:
targets: wasm32-wasip1 wasm32-unknown-unknown
targets: wasm32-wasip2 wasm32-unknown-unknown

- name: Install latest Rust stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-wasip1 wasm32-unknown-unknown
targets: wasm32-wasip2 wasm32-unknown-unknown
components: clippy, rustfmt

- name: Install Rust std source
Expand All @@ -57,7 +57,7 @@ jobs:
shell: bash
run: |
cd /tmp
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
tar xf wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
mv wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk

Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
shell: bash
run: |
cd /tmp
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
tar xf wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz

- name: Install WASI-SDK
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
before-script-linux: |
rustup install nightly
rustup component add rust-src --toolchain nightly
rustup target add wasm32-wasip1 wasm32-unknown-unknown
rustup target add wasm32-wasip2 wasm32-unknown-unknown

- name: Set up cross-compiled linux aarch64 build
if: matrix.config.target == 'aarch64-unknown-linux-gnu'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:

env:
CARGO_TERM_COLOR: always
WASI_SDK_VERSION: 20.46gf3a1f8991535
WASI_SDK_RELEASE: wasi-sockets-alpha-5
WASI_SDK_VERSION: 25.0
WASI_SDK_RELEASE: wasi-sdk-25

jobs:
linux:
Expand All @@ -30,12 +30,12 @@ jobs:
- name: Install latest Rust nightly toolchain
uses: dtolnay/rust-toolchain@nightly
with:
targets: wasm32-wasip1 wasm32-unknown-unknown
targets: wasm32-wasip2 wasm32-unknown-unknown

- name: Install latest Rust stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-wasip1 wasm32-unknown-unknown
targets: wasm32-wasip2 wasm32-unknown-unknown
components: clippy, rustfmt

- name: Install Rust std source
Expand All @@ -51,7 +51,7 @@ jobs:
shell: bash
run: |
cd /tmp
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
tar xf wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz
mv wasi-sdk-${WASI_SDK_VERSION} /opt/wasi-sdk

Expand Down Expand Up @@ -86,12 +86,12 @@ jobs:
- name: Install latest Rust nightly toolchain
uses: dtolnay/rust-toolchain@nightly
with:
targets: wasm32-wasip1 wasm32-unknown-unknown
targets: wasm32-wasip2 wasm32-unknown-unknown

- name: Install latest Rust stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-wasip1 wasm32-unknown-unknown
targets: wasm32-wasip2 wasm32-unknown-unknown
components: clippy, rustfmt

- name: Install Rust std source
Expand All @@ -107,7 +107,7 @@ jobs:
shell: bash
run: |
cd /tmp
curl -LO https://github.com/dicej/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/${WASI_SDK_RELEASE}/wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz
tar xf wasi-sdk-${WASI_SDK_VERSION}-${{ matrix.config.wasiSDK }}.tar.gz

- name: Install WASI-SDK
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ For Rust, something like this should work once you have `rustup`:
rustup update
rustup install nightly
rustup component add rust-src --toolchain nightly
rustup target add wasm32-wasip1 wasm32-unknown-unknown
rustup target add --toolchain nightly wasm32-wasip1 wasm32-unknown-unknown
rustup target add wasm32-wasip2 wasm32-unknown-unknown
rustup target add --toolchain nightly wasm32-wasip2 wasm32-unknown-unknown
```

### Building and Running
Expand All @@ -48,9 +48,9 @@ variable). Replace `linux` with `macos` or `mingw` (Windows) below depending on
your OS.

```shell
curl -LO https://github.com/dicej/wasi-sdk/releases/download/wasi-sockets-alpha-5/wasi-sdk-20.46gf3a1f8991535-linux.tar.gz
tar xf wasi-sdk-20.46gf3a1f8991535-linux.tar.gz
sudo mv wasi-sdk-20.46gf3a1f8991535 /opt/wasi-sdk
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz
tar xf wasi-sdk-25.0-x86_64-linux.tar.gz
sudo mv wasi-sdk-25.0-x86_64-linux /opt/wasi-sdk
export WASI_SDK_PATH=/opt/wasi-sdk
```

Expand Down
4 changes: 2 additions & 2 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
.arg("-Z")
.arg("build-std=panic_abort,std")
.arg("--release")
.arg("--target=wasm32-wasip1");
.arg("--target=wasm32-wasip2");

for (key, _) in env::vars_os() {
if key
Expand All @@ -132,7 +132,7 @@ fn package_all_the_things(out_dir: &Path) -> Result<()> {
assert!(status.success());
println!("cargo:rerun-if-changed=runtime");

let path = out_dir.join("wasm32-wasip1/release/libcomponentize_py_runtime.a");
let path = out_dir.join("wasm32-wasip2/release/libcomponentize_py_runtime.a");

if path.exists() {
let clang = wasi_sdk.join(format!("bin/{CLANG_EXECUTABLE}"));
Expand Down
Loading