Merge pull request #62 from michelleN/fixci

update rust target to wasm32-wasip1

Author: michelleN

.cargo/config.toml

@@ -2,4 +2,4 @@
 git-fetch-with-cli = true
 
 [build]
-target = "wasm32-wasi"
+target = "wasm32-wasip1"

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
           components: clippy, rustfmt
 
       - name: Install Wasm Rust target
-        run: rustup target add wasm32-wasi
+        run: rustup target add wasm32-wasip1
 
       - name: Install spin-test
         run: |

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
           components: clippy, rustfmt
 
       - name: Install Wasm Rust target
-        run: rustup target add wasm32-wasi
+        run: rustup target add wasm32-wasip1
 
       - name: Make
         run: make
@@ -33,13 +33,13 @@ jobs:
 
       - name: generate checksums
         run: |
-          sha256sum target/wasm32-wasi/release/spin_static_fs.wasm > checksums-${{ env.RELEASE_VERSION }}.txt
+          sha256sum target/wasm32-wasip1/release/spin_static_fs.wasm > checksums-${{ env.RELEASE_VERSION }}.txt
 
       - name: Create release
         uses: softprops/action-gh-release@v1
         with:
           fail_on_unmatched_files: true
           generate_release_notes: true
           files: |
-            target/wasm32-wasi/release/spin_static_fs.wasm
+            target/wasm32-wasip1/release/spin_static_fs.wasm
             checksums-${{ env.RELEASE_VERSION }}.txt

README.md

@@ -19,7 +19,7 @@ and [NGINX Unit](https://unit.nginx.org/).
 
 Prerequisites:
 
-- [Rust](https://www.rust-lang.org/) at [1.72+](https://www.rust-lang.org/tools/install) with the `wasm32-wasi` target configured
+- [Rust](https://www.rust-lang.org/) at [1.72+](https://www.rust-lang.org/tools/install) with the `wasm32-wasip1` target configured
 - [cargo-component](https://github.com/bytecodealliance/cargo-component)
 - [Spin v2.0](https://github.com/fermyon/spin) to run the component/examples
 
@@ -36,7 +36,7 @@ See the [examples](./examples) directory for examples of using and composing `sp
 Prerequisites:
 
 - [Rust](https://www.rust-lang.org/) at
-  [1.72+](https://www.rust-lang.org/tools/install) with the `wasm32-wasi` target
+  [1.72+](https://www.rust-lang.org/tools/install) with the `wasm32-wasip1` target
   configured
 
 Running test cases:
@@ -84,7 +84,7 @@ component = "fs"
 
 # For more on configuring a component, see: https://developer.fermyon.com/spin/writing-apps
 [component.fs]
-source = "target/wasm32-wasi/release/spin_static_fs.wasm"
+source = "target/wasm32-wasip1/release/spin_static_fs.wasm"
 files = [{ source = "", destination = "/" }]
 [component.fs.build]
 command = "make"
@@ -145,7 +145,7 @@ is useful for Single Page Applications that use view routers on the front-end li
 ```toml
 # For more on configuring a component, see: https://developer.fermyon.com/spin/writing-apps#adding-environment-variables-to-components
 [component.fs]
-source = "target/wasm32-wasi/release/spin_static_fs.wasm"
+source = "target/wasm32-wasip1/release/spin_static_fs.wasm"
 files = [{ source = "test", destination = "/" }]
 environment = { FALLBACK_PATH = "index.html" }
 ```
@@ -157,7 +157,7 @@ You can configure a `CUSTOM_404_PATH` environment variable and point to a file t
 ```toml
 # For more on configuring a component, see: https://developer.fermyon.com/spin/writing-apps#adding-environment-variables-to-components
 [component.fs]
-source = "target/wasm32-wasi/release/spin_static_fs.wasm"
+source = "target/wasm32-wasip1/release/spin_static_fs.wasm"
 files = [{ source = "test", destination = "/" }]
 environment = { CUSTOM_404_PATH = "404.html" }
 ```

examples/javascript/README.md

@@ -19,7 +19,7 @@ component for serving static files.
 Once you have Rust and NodeJS installed, the following should give you everything else:
 
 ```shell
-rustup target add wasm32-wasi
+rustup target add wasm32-wasip1
 cargo install cargo-component
 cargo install wac-cli
 npm install -g @bytecodealliance/jco @bytecodealliance/componentize-js

examples/javascript/spin.toml

@@ -14,5 +14,5 @@ component = "spin-fileserver-example"
 source = "composed.wasm"
 files = [{ source = "../static", destination = "/" }]
 [component.spin-fileserver-example.build]
-command = "npm install && node build.mjs && (cd .. && cargo component build --release) && RUST_LOG=error wac plug --plug ../../target/wasm32-wasi/release/spin_static_fs.wasm  http.wasm -o composed.wasm"
+command = "npm install && node build.mjs && (cd .. && cargo component build --release) && RUST_LOG=error wac plug --plug ../../target/wasm32-wasip1/release/spin_static_fs.wasm  http.wasm -o composed.wasm"
 watch = ["*.js"]

examples/python/README.md

@@ -20,7 +20,7 @@ component for serving static files.
 Once you have Rust, Python, and pip installed, the following should give you everything else:
 
 ```shell
-rustup target add wasm32-wasi
+rustup target add wasm32-wasip1
 cargo install cargo-component
 cargo install wac-cli
 pip install componentize-py=0.13.5

examples/python/spin.toml

@@ -14,5 +14,5 @@ component = "spin-fileserver-example"
 source = "composed.wasm"
 files = [{ source = "../static", destination = "/" }]
 [component.spin-fileserver-example.build]
-command = "componentize-py -d ../wit -w proxy componentize app -o http.wasm && (cd .. && cargo component build --release) && RUST_LOG=error wac plug --plug ../../target/wasm32-wasi/release/spin_static_fs.wasm http.wasm -o composed.wasm"
+command = "componentize-py -d ../wit -w proxy componentize app -o http.wasm && (cd .. && cargo component build --release) && RUST_LOG=error wac plug --plug ../../target/wasm32-wasip1/release/spin_static_fs.wasm http.wasm -o composed.wasm"
 watch = ["*.py"]

examples/rust-standalone/README.md

@@ -8,13 +8,13 @@ in the [rust](../rust), [javascript](../javascript/) and [pythong](../python/) e
 ## Prerequisites
 
 - [Spin v2.0+](https://developer.fermyon.com/spin/install)
-- [Rust](https://rustup.rs/), including the `wasm32-wasi` target
+- [Rust](https://rustup.rs/), including the `wasm32-wasip1` target
 - [curl](https://curl.se/download.html) or a web browser for testing
 
 Once you have Rust installed, the following should give you everything else:
 
 ```shell
-rustup target add wasm32-wasi
+rustup target add wasm32-wasip1
 ```
 
 ## Building and Running

examples/rust-standalone/spin.toml

@@ -15,16 +15,16 @@ route = "/hello"
 component = "hello"
 
 [component.fs]
-source = "../../target/wasm32-wasi/release/spin_static_fs.wasm"
+source = "../../target/wasm32-wasip1/release/spin_static_fs.wasm"
 description = "A fileserver component to serve static assets"
 files = [{ source = "../static", destination = "/" }]
 [component.fs.build]
 workdir = "../../"
 command = "cargo build --release"
 
 [component.hello]
-source = "target/wasm32-wasi/release/rust_standalone.wasm"
+source = "target/wasm32-wasip1/release/rust_standalone.wasm"
 description = "A simple component that returns hello."
 [component.hello.build]
-command = "cargo build --target wasm32-wasi --release"
+command = "cargo build --target wasm32-wasip1 --release"
 watch = ["src/**/*.rs", "Cargo.toml"]