From 2c035e90e5f84e5bf8b7a115a96ddfc3e6484c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Wed, 6 Dec 2023 14:09:12 +0800 Subject: [PATCH] Use CLI's flag instead of exclude example. https://github.com/bytecodealliance/wasmtime/pull/4312 --- .github/workflows/main-checks.yml | 4 +- Cargo.lock | 91 ++++++++++++++++++++++++++++- Cargo.toml | 1 - examples/wasi_ssr_module/.gitignore | 2 - 4 files changed, 91 insertions(+), 7 deletions(-) delete mode 100644 examples/wasi_ssr_module/.gitignore diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 0a6caee0a46..97f4e26ea05 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -175,8 +175,8 @@ jobs: - name: Build and run example wasi_ssr_module run: | - cargo build --manifest-path examples/wasi_ssr_module/Cargo.toml --target wasm32-wasi - ~/wasmtime examples/wasi_ssr_module/target/wasm32-wasi/debug/wasi_ssr_module.wasm + cargo build --package wasi_ssr_module --target wasm32-wasi + ~/wasmtime --trap-unknown-imports target/wasm32-wasi/debug/wasi_ssr_module.wasm test-lints: name: Test lints on nightly diff --git a/Cargo.lock b/Cargo.lock index 4b4508dfc15..0eef99df834 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -718,6 +718,16 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "dns-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +dependencies = [ + "byteorder", + "quick-error 1.2.3", +] + [[package]] name = "dyn_create_destroy_apps" version = "0.1.0" @@ -2082,6 +2092,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio_wasi" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826049861effde5245d1107a8eb21846bd8fc7a16486e60be4d0568361c947e5" +dependencies = [ + "libc", + "log", + "wasi", + "wasmedge_wasi_socket", + "windows-sys 0.48.0", +] + [[package]] name = "mount_point" version = "0.1.0" @@ -2475,6 +2498,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quick-error" version = "2.0.1" @@ -3165,10 +3194,21 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2 0.5.4", - "tokio-macros", + "tokio-macros 2.1.0", "windows-sys 0.48.0", ] +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "tokio-macros" version = "2.1.0" @@ -3227,6 +3267,27 @@ dependencies = [ "tracing", ] +[[package]] +name = "tokio_wasi" +version = "1.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3a7120cdbe4719425355a0f6b59191c67ab5ed4eebc64bdb12ea3bc8776adf" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio_wasi", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.4.9", + "tokio-macros 1.8.2", + "wasmedge_wasi_socket", + "windows-sys 0.45.0", +] + [[package]] name = "toml_datetime" version = "0.6.3" @@ -3520,6 +3581,20 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi_ssr_module" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes", + "lazy_static", + "serde", + "serde_json", + "tokio_wasi", + "yew", + "yew-router", +] + [[package]] name = "wasm-bindgen" version = "0.2.87" @@ -3621,6 +3696,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmedge_wasi_socket" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900a4c17690ef5efcccbdc833853b3e48f2a0de589427a609ddb5e866e1cb91f" +dependencies = [ + "bytes", + "dns-parser", + "libc", + "rand", +] + [[package]] name = "web-sys" version = "0.3.64" @@ -4019,7 +4106,7 @@ dependencies = [ "itertools", "js-sys", "lazy_static", - "quick-error", + "quick-error 2.0.1", "regex", "time", ] diff --git a/Cargo.toml b/Cargo.toml index 61cefa91188..a178501fd18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = ["packages/*", "tools/*", "examples/*"] -exclude = ["examples/wasi_ssr_module"] default-members = ["packages/*"] resolver = "2" diff --git a/examples/wasi_ssr_module/.gitignore b/examples/wasi_ssr_module/.gitignore deleted file mode 100644 index 96ef6c0b944..00000000000 --- a/examples/wasi_ssr_module/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -Cargo.lock