Skip to content

fix: replace wasi with wasip1 #439

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: replace wasi with wasip1 #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 examples/call_parameters/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ cargo run --release -p marine -- build --release;
rm -f artifacts/* || true;
mkdir -p artifacts;

cp ../../target/wasm32-wasi/release/call_parameters.wasm artifacts/;
cp ../../target/wasm32-wasip1/release/call_parameters.wasm artifacts/;
2 changes: 1 addition & 1 deletion examples/failing/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ cargo run --release -p marine -- build --release
rm artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/failing.wasm artifacts/
cp ../../target/wasm32-wasip1/release/failing.wasm artifacts/
2 changes: 1 addition & 1 deletion examples/greeting/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ cargo run --release -p marine -- build --release
rm artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/greeting.wasm artifacts/
cp ../../target/wasm32-wasip1/release/greeting.wasm artifacts/
2 changes: 1 addition & 1 deletion examples/greeting_record/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ cargo run --release -p marine -- build --release
rm artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/greeting-record.wasm artifacts/
cp ../../target/wasm32-wasip1/release/greeting-record.wasm artifacts/
4 changes: 2 additions & 2 deletions examples/ipfs-node/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
rm artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/ipfs_effector.wasm artifacts/
cp ../../target/wasm32-wasi/release/ipfs_pure.wasm artifacts/
cp ../../target/wasm32-wasip1/release/ipfs_effector.wasm artifacts/
cp ../../target/wasm32-wasip1/release/ipfs_pure.wasm artifacts/
4 changes: 2 additions & 2 deletions examples/motivational-example/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
rm -f artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/shrek.wasm artifacts/
cp ../../target/wasm32-wasi/release/donkey.wasm artifacts/
cp ../../target/wasm32-wasip1/release/shrek.wasm artifacts/
cp ../../target/wasm32-wasip1/release/donkey.wasm artifacts/
5 changes: 3 additions & 2 deletions examples/records/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
rm artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/records_effector.wasm artifacts/
cp ../../target/wasm32-wasi/release/records_pure.wasm artifacts/
export MARINE_PROJECT=wasm32-wasip1
cp ../../target/$MARINE_TARGET/release/records_effector.wasm artifacts/
cp ../../target/$MARINE_TARGET/release/records_pure.wasm artifacts/
2 changes: 1 addition & 1 deletion examples/sqlite/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ cargo run --release -p marine -- build --release
rm artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/sqlite_test.wasm artifacts/
cp ../../target/wasm32-wasip1/release/sqlite_test.wasm artifacts/
wget https://github.com/fluencelabs/sqlite/releases/download/v0.14.0_w/sqlite3.wasm
mv sqlite3.wasm artifacts/
7 changes: 4 additions & 3 deletions examples/url-downloader/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
rm -f artifacts/* || true
mkdir -p artifacts

cp ../../target/wasm32-wasi/release/local_storage.wasm artifacts/
cp ../../target/wasm32-wasi/release/curl_adapter.wasm artifacts/
cp ../../target/wasm32-wasi/release/facade.wasm artifacts/
export MARINE_TARGET=wasm32-wasip1
cp ../../target/$MARINE_TARGET/release/local_storage.wasm artifacts/
cp ../../target/$MARINE_TARGET/release/curl_adapter.wasm artifacts/
cp ../../target/$MARINE_TARGET/release/facade.wasm artifacts/
4 changes: 2 additions & 2 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[toolchain]
channel = "nightly-2023-11-11"
channel = "nightly-2024-06-10"
targets = [
"x86_64-unknown-linux-gnu",
"x86_64-unknown-linux-musl",
"x86_64-apple-darwin",
"wasm32-wasi",
"wasm32-wasip1",
"wasm32-unknown-unknown",
]
2 changes: 1 addition & 1 deletion tools/cli/src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub(crate) fn build(trailing_args: Vec<&str>) -> CLIResult<()> {
env_logger::init();

let mut cargo = Command::new("cargo");
cargo.arg("build").arg("--target").arg("wasm32-wasi");
cargo.arg("build").arg("--target").arg("wasm32-wasip1");
cargo.arg("--message-format").arg("json-render-diagnostics");
cargo.args(trailing_args.iter());

Expand Down