Skip to content
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.

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

Switch from wasm32-wasi to wasm32-wasip1 #2372

Merged
merged 1 commit into from
Dec 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build_and_test: &BUILD_AND_TEST
only_if: $CIRRUS_BRANCH =~ 'gh-readonly-queue/.*' || $CIRRUS_PR != ""
setup_script:
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
- rustup target add wasm32-wasi
- rustup target add wasm32-wasip1
- python3 -m pip install --upgrade cffi virtualenv
build_script:
- cargo build
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/post_create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ pipx ensurepath
pipx install uniffi-bindgen
pipx install cargo-deny

rustup target add wasm32-wasi
rustup target add wasm32-wasip1
curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
id: rustup
with:
targets: wasm32-wasi # Used by the test suite
targets: wasm32-wasip1 # Used by the test suite
- name: Install cargo-nextest
uses: taiki-e/install-action@nextest
- name: Install additional Rust target
Expand Down
5 changes: 3 additions & 2 deletions tests/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -518,11 +518,12 @@ fn integration_wasm_hello_world() {
None,
"integration-wasm-hello-world",
false,
Some("wasm32-wasi"),
Some("wasm32-wasip1"),
));

let python_implementation = test_python_implementation().unwrap();
let venv_name = format!("integration-wasm-hello-world-py3-wasm32-wasi-{python_implementation}");
let venv_name =
format!("integration-wasm-hello-world-py3-wasm32-wasip1-{python_implementation}");

// Make sure we're actually running wasm
assert!(Path::new("test-crates")
Expand Down
Loading