Skip to content

Commit

Permalink
Switch from wasm32-wasi to wasm32-wasip1
Browse files Browse the repository at this point in the history
  • Loading branch information
messense committed Dec 7, 2024
1 parent 5f276f9 commit bb454da
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
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

0 comments on commit bb454da

Please sign in to comment.