From c5fb38fd32a8d307ca271add2f89e64ccf44b0fa Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Wed, 24 Sep 2025 12:28:38 -0400 Subject: [PATCH 1/4] Drop cargo component Use wasm32-wasip2 directly with rust 1.89 Signed-off-by: Scott Andrews --- .github/workflows/ci.yaml | 11 +++-------- Makefile | 7 +++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5f53940..a47f034 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,13 +15,10 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.84.1 - components: rustfmt - target: wasm32-unknown-unknown,wasm32-wasip2 + toolchain: 1.89 + target: wasm32-wasip2 - name: Install cargo binstall uses: cargo-bins/cargo-binstall@main - - name: Install cargo component - run: cargo binstall --force cargo-component - name: Install wkg run: cargo binstall --force wkg - name: Fetch wit @@ -52,9 +49,7 @@ jobs: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.84.1 - components: rustfmt - target: wasm32-unknown-unknown + toolchain: 1.89 - name: Install cargo binstall uses: cargo-bins/cargo-binstall@main - name: Install wkg diff --git a/Makefile b/Makefile index 78ccfe5..398d542 100644 --- a/Makefile +++ b/Makefile @@ -20,13 +20,12 @@ components: $(foreach component,$(COMPONENTS),lib/$(component).wasm $(foreach co define BUILD_COMPONENT lib/$1.wasm: Cargo.toml Cargo.lock wit/deps $(shell find components/$1 -type f) - @$(eval TARGET := $(if $(findstring $1,keyvalue-to-filesystem),wasm32-wasip2,wasm32-unknown-unknown)) - cargo component build -p $1 --target $(TARGET) --release - cp target/$(TARGET)/release/$(subst -,_,$1).wasm lib/$1.wasm + cargo build -p $1 --target wasm32-wasip2 --release + cp target/wasm32-wasip2/release/$(subst -,_,$1).wasm lib/$1.wasm cp components/$1/README.md lib/$1.wasm.md lib/$1.debug.wasm: Cargo.toml Cargo.lock wit/deps $(shell find components/$1 -type f) - cargo component build -p $1 --target wasm32-wasip2 + cargo build -p $1 --target wasm32-wasip2 cp target/wasm32-wasip2/debug/$(subst -,_,$1).wasm lib/$1.debug.wasm cp components/$1/README.md lib/$1.debug.wasm.md From 1e0627d77b46299fb7d7aca22696af4fc7f701dd Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Wed, 24 Sep 2025 15:14:18 -0400 Subject: [PATCH 2/4] update build prereqs in readme Signed-off-by: Scott Andrews --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 78d8e5c..7e0f88a 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ A collection of utility components that remix wasi:cli types and interfaces. ## Build Prereqs: -- a rust toolchain with a recent nightly (`rustup toolchain install nightly`) -- [`cargo component`](https://github.com/bytecodealliance/cargo-component) +- a rust toolchain with wasm32-wasip2 (`rustup target add wasm32-wasip2`) - [`wkg`](https://github.com/bytecodealliance/wasm-pkg-tools) ```sh From 94ffe5a040efa9bc1c795ff986bc96542902692f Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Wed, 24 Sep 2025 15:23:08 -0400 Subject: [PATCH 3/4] set wasm32-wasip2 as default target Signed-off-by: Scott Andrews --- .cargo/config.toml | 2 ++ Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..f68f33c --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[build] +target = "wasm32-wasip2" diff --git a/Makefile b/Makefile index 398d542..f13c71e 100644 --- a/Makefile +++ b/Makefile @@ -20,12 +20,12 @@ components: $(foreach component,$(COMPONENTS),lib/$(component).wasm $(foreach co define BUILD_COMPONENT lib/$1.wasm: Cargo.toml Cargo.lock wit/deps $(shell find components/$1 -type f) - cargo build -p $1 --target wasm32-wasip2 --release + cargo build -p $1 --release cp target/wasm32-wasip2/release/$(subst -,_,$1).wasm lib/$1.wasm cp components/$1/README.md lib/$1.wasm.md lib/$1.debug.wasm: Cargo.toml Cargo.lock wit/deps $(shell find components/$1 -type f) - cargo build -p $1 --target wasm32-wasip2 + cargo build -p $1 cp target/wasm32-wasip2/debug/$(subst -,_,$1).wasm lib/$1.debug.wasm cp components/$1/README.md lib/$1.debug.wasm.md From 9df3e468e35fd7d032b67d36aaaf3ffc6fdfa6db Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Wed, 24 Sep 2025 15:27:45 -0400 Subject: [PATCH 4/4] define rust channel in rust-toolchain.toml Signed-off-by: Scott Andrews --- .github/workflows/ci.yaml | 5 ----- rust-toolchain.toml | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a47f034..0bce520 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,9 +14,6 @@ jobs: steps: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: 1.89 - target: wasm32-wasip2 - name: Install cargo binstall uses: cargo-bins/cargo-binstall@main - name: Install wkg @@ -48,8 +45,6 @@ jobs: steps: - uses: actions/checkout@v5 - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: 1.89 - name: Install cargo binstall uses: cargo-bins/cargo-binstall@main - name: Install wkg diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..daaf687 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.89" +targets = [ "wasm32-wasip2" ]