diff --git a/integration-tests/src/benchmarks/rpc.rs b/integration-tests/src/benchmarks/rpc.rs index 4a2f6db4f..1874275f2 100644 --- a/integration-tests/src/benchmarks/rpc.rs +++ b/integration-tests/src/benchmarks/rpc.rs @@ -92,7 +92,7 @@ impl Benchmark for Rpc { .await; let component_id = benchmark_context .deps - .store_unique_component("parent_component_composed") + .store_unique_component("parent_component") .await; let mut worker_ids = Vec::new(); diff --git a/integration-tests/src/benchmarks/rpc_cpu_intensive.rs b/integration-tests/src/benchmarks/rpc_cpu_intensive.rs index 704f6677b..4d0e6a16a 100644 --- a/integration-tests/src/benchmarks/rpc_cpu_intensive.rs +++ b/integration-tests/src/benchmarks/rpc_cpu_intensive.rs @@ -92,7 +92,7 @@ impl Benchmark for RpcCpuIntensive { .await; let component_id = benchmark_context .deps - .store_unique_component("parent_component_composed") + .store_unique_component("parent_component") .await; let mut worker_ids = Vec::new(); diff --git a/integration-tests/src/benchmarks/rpc_large_input.rs b/integration-tests/src/benchmarks/rpc_large_input.rs index d54b3c956..19039a8cf 100644 --- a/integration-tests/src/benchmarks/rpc_large_input.rs +++ b/integration-tests/src/benchmarks/rpc_large_input.rs @@ -93,7 +93,7 @@ impl Benchmark for RpcLargeInput { .await; let component_id = benchmark_context .deps - .store_unique_component("parent_component_composed") + .store_unique_component("parent_component") .await; let mut worker_ids = Vec::new(); diff --git a/test-components/child_component.wasm b/test-components/child_component.wasm index 73975fbd1..be72890b6 100755 Binary files a/test-components/child_component.wasm and b/test-components/child_component.wasm differ diff --git a/test-components/parent_component.wasm b/test-components/parent_component.wasm new file mode 100644 index 000000000..08d26747d Binary files /dev/null and b/test-components/parent_component.wasm differ diff --git a/test-components/parent_component_composed.wasm b/test-components/parent_component_composed.wasm deleted file mode 100644 index 70dc472e6..000000000 Binary files a/test-components/parent_component_composed.wasm and /dev/null differ diff --git a/test-components/rust-service/rpc/Makefile.toml b/test-components/rust-service/rpc/Makefile.toml deleted file mode 100644 index 47fdd330c..000000000 --- a/test-components/rust-service/rpc/Makefile.toml +++ /dev/null @@ -1,60 +0,0 @@ -[config] -default_to_workspace = false - -[tasks.add-stub-dependency-child-component-parent-component] -args = ["stubgen", "add-stub-dependency", "--stub-wit-root", "child-component-stub/wit", "--dest-wit-root", "parent-component/wit", "--overwrite", "--update-cargo-toml"] -command = "golem-cli" -cwd = "." -dependencies = ["generate-child-component-stub"] - -[tasks.build] -args = ["build"] -command = "cargo-component" -dependencies = ["clean", "regenerate-stubs"] - -[tasks.build-flow] -dependencies = ["build", "post-build"] - -[tasks.build-release] -args = ["build", "--release"] -command = "cargo-component" -dependencies = ["clean", "regenerate-stubs"] - -[tasks.clean] -args = ["clean"] -command = "cargo-component" - -[tasks.compose-parent-component] -args = ["stubgen", "compose", "--source-wasm", "target/wasm32-wasi/debug/parent_component.wasm", "--stub-wasm", "target/wasm32-wasi/debug/child_component_stub.wasm", "--dest-wasm", "target/wasm32-wasi/debug/parent_component_composed.wasm"] -command = "golem-cli" -cwd = "." - -[tasks.compose-release-parent-component] -args = ["stubgen", "compose", "--source-wasm", "target/wasm32-wasi/release/parent_component.wasm", "--stub-wasm", "target/wasm32-wasi/release/child_component_stub.wasm", "--dest-wasm", "target/wasm32-wasi/release/parent_component_composed.wasm"] -command = "golem-cli" -cwd = "." - -[tasks.default] -alias = "build" - -[tasks.generate-child-component-stub] -args = ["stubgen", "generate", "-s", "child-component/wit", "-d", "child-component-stub"] -command = "golem-cli" -cwd = "." - -[tasks.post-build] -dependencies = ["compose-parent-component"] - -[tasks.post-build-release] -dependencies = ["compose-release-parent-component"] - -[tasks.regenerate-stubs] -dependencies = ["add-stub-dependency-child-component-parent-component"] - -[tasks.release-build-flow] -dependencies = ["build-release", "post-build-release"] - -[tasks.test] -args = ["test"] -command = "cargo-component" -dependencies = ["clean"] diff --git a/test-components/rust-service/rpc/README.md b/test-components/rust-service/rpc/README.md index 20ed3dca9..d30e0e462 100644 --- a/test-components/rust-service/rpc/README.md +++ b/test-components/rust-service/rpc/README.md @@ -3,8 +3,7 @@ Internally, it uses the same functionalities (and data) as the rust-service/rust-component-service. ```bash - golem-cli app -b release build - +golem-cli app -b release copy ``` diff --git a/test-components/rust-service/rpc/golem.yaml b/test-components/rust-service/rpc/golem.yaml index 42d749f4e..e04ed5252 100644 --- a/test-components/rust-service/rpc/golem.yaml +++ b/test-components/rust-service/rpc/golem.yaml @@ -21,7 +21,7 @@ templates: linkedWasm: ../target/golem-components/debug/{{ component_name | to_snake_case }}.wasm customCommands: copy: - - command: cp ../target/golem-components/debug/{{ component_name | to_snake_case }}.wasm ../.. + - command: cp ../target/golem-components/debug/{{ component_name | to_snake_case }}.wasm ../../.. clean: - src/bindings.rs release: @@ -36,6 +36,9 @@ templates: generatedWit: wit-generated componentWasm: ../target/wasm32-wasi/release/{{ component_name | to_snake_case }}.wasm linkedWasm: ../target/golem-components/release/{{ component_name | to_snake_case }}.wasm + customCommands: + copy: + - command: cp ../target/golem-components/release/{{ component_name | to_snake_case }}.wasm ../../.. clean: - src/bindings.rs defaultProfile: debug