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.

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

toolchain: use wasm32-wasip1 target, remove nightly requirement #74

Closed
wants to merge 2 commits into from
Closed

toolchain: use wasm32-wasip1 target, remove nightly requirement #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9a0aa
toolchain: use wasm32-wasip1 target, remove nightly requirement
guybedford Jul 26, 2024
966a3fd
fixup target install
guybedford Jul 26, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
submodules: recursive

- name: Install Rust
run: rustup update nightly --no-self-update && rustup default nightly && rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
run: rustup update stable --no-self-update && rustup default stable && rustup component add rust-src --toolchain stable

- name: Install wasm32-unknown target
run: rustup target add wasm32-unknown-unknown

- name: Install wasm32-wasi target
run: rustup target add wasm32-wasi
- name: Install wasm32-wasip1 target
run: rustup target add wasm32-wasip1

- name: Install wasm-tools
run: cargo install wasm-tools
Expand Down
4 changes: 0 additions & 4 deletions rust-toolchain.toml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tests/virt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ async fn virt_test() -> Result<()> {
let mut generated_component_path = generated_path.join(component_name);
generated_component_path.set_extension("component.wasm");
cmd(&format!(
"cargo build -p {component_name} --target wasm32-wasi {}",
"cargo build -p {component_name} --target wasm32-wasip1 {}",
if DEBUG { "" } else { "--release" }
))?;

Expand All @@ -107,7 +107,7 @@ async fn virt_test() -> Result<()> {

// encode the component
let component_core_path = &format!(
"target/wasm32-wasi/{}/{}.wasm",
"target/wasm32-wasip1/{}/{}.wasm",
if DEBUG { "debug" } else { "release" },
component_name.to_snake_case()
);
Expand Down
Loading