From c9e52743644da8fdcf7da2deb0630cfd9939ed23 Mon Sep 17 00:00:00 2001 From: Christoph Herzog Date: Fri, 1 Dec 2023 15:05:01 +0100 Subject: [PATCH 1/3] deps: Bump edge-cli version --- lib/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index 64ee49d825d..57679da8734 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -64,7 +64,7 @@ virtual-net = { version = "0.6.1", path = "../virtual-net" } # Wasmer-owned dependencies. webc = { workspace = true } -wasmer-edge-cli = { version = "=0.1.1", default-features = false } +wasmer-edge-cli = { version = "=0.1.2", default-features = false } # Third-party dependencies. From 3c2b536b71b1b3e26451fa179c80a83215a173fc Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Fri, 1 Dec 2023 17:56:58 +0330 Subject: [PATCH 2/3] Update Cargo.lock --- Cargo.lock | 60 ++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9fed27ad6c6..848839e8714 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5799,7 +5799,7 @@ dependencies = [ "wasmer-emscripten", "wasmer-object", "wasmer-registry 5.10.0", - "wasmer-toml 0.9.2", + "wasmer-toml", "wasmer-types", "wasmer-vm", "wasmer-wasix", @@ -5932,9 +5932,9 @@ dependencies = [ [[package]] name = "wasmer-edge-cli" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6efa3ced01dd6f1f7b2cab243e323136412bb186fea31c3b751081cc883403" +checksum = "ce09190ea5ebf04ff8d51328f77599dd71b151179c75d4768cbd86b9905f933a" dependencies = [ "anyhow", "clap", @@ -5965,8 +5965,8 @@ dependencies = [ "virtual-mio 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "virtual-net 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-api", - "wasmer-registry 5.9.0", - "wasmer-toml 0.9.2", + "wasmer-registry 5.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-toml", "webc", ] @@ -6065,12 +6065,12 @@ dependencies = [ [[package]] name = "wasmer-registry" -version = "5.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2ecfb16d793bfe1e2b98af07e6f344bd00ba0efea8e1b24737701d823a3ee" +version = "5.10.0" dependencies = [ "anyhow", + "clap", "console", + "dialoguer 0.11.0", "dirs", "filetime", "flate2", @@ -6083,6 +6083,7 @@ dependencies = [ "log", "lzma-rs", "minisign", + "pretty_assertions", "regex", "reqwest", "rpassword", @@ -6097,9 +6098,10 @@ dependencies = [ "tldextract", "tokio", "toml 0.5.11", + "tracing", "url", - "wasmer-toml 0.8.1", - "wasmer-wasm-interface 4.2.3", + "wasmer-toml", + "wasmer-wasm-interface 4.2.4", "wasmparser 0.51.4", "whoami", ] @@ -6107,9 +6109,10 @@ dependencies = [ [[package]] name = "wasmer-registry" version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c06bbf7ad273a7c367b2e8ac7446ed830cf97c22db4bb6cc6ae39e188b6d1ce" dependencies = [ "anyhow", - "clap", "console", "dialoguer 0.11.0", "dirs", @@ -6124,7 +6127,6 @@ dependencies = [ "log", "lzma-rs", "minisign", - "pretty_assertions", "regex", "reqwest", "rpassword", @@ -6141,8 +6143,8 @@ dependencies = [ "toml 0.5.11", "tracing", "url", - "wasmer-toml 0.9.2", - "wasmer-wasm-interface 4.2.4", + "wasmer-toml", + "wasmer-wasm-interface 4.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser 0.51.4", "whoami", ] @@ -6161,24 +6163,6 @@ dependencies = [ "wasmer-wasix", ] -[[package]] -name = "wasmer-toml" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80dd00e4ae6e2f13c1fba9c8fd49d2567985c8099f9c9920aa4bb922c59e4f54" -dependencies = [ - "anyhow", - "derive_builder", - "indexmap 1.9.3", - "semver 1.0.20", - "serde", - "serde_cbor", - "serde_json", - "serde_yaml 0.9.27", - "thiserror", - "toml 0.5.11", -] - [[package]] name = "wasmer-toml" version = "0.9.2" @@ -6352,26 +6336,26 @@ dependencies = [ [[package]] name = "wasmer-wasm-interface" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70759b128088ce07ab6f31b97d83ceb8642285c650677fc84f554d68dc534ac4" +version = "4.2.4" dependencies = [ + "bincode", "either", "nom 5.1.3", "serde", "wasmparser 0.51.4", + "wat", ] [[package]] name = "wasmer-wasm-interface" version = "4.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a53f9caef66f4deaa939d91cc8fe6cbe19411e6ffdff871639e29ddde97e3a6" dependencies = [ - "bincode", "either", "nom 5.1.3", "serde", "wasmparser 0.51.4", - "wat", ] [[package]] @@ -6644,7 +6628,7 @@ dependencies = [ "toml 0.7.8", "url", "walkdir", - "wasmer-toml 0.9.2", + "wasmer-toml", ] [[package]] From 9e2e1091f67bcc63598e7dd34eab3772a8e2954b Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Mon, 4 Dec 2023 19:02:06 +0330 Subject: [PATCH 3/3] Remove the wasmer-web workflow since the code is deprecated --- .github/workflows/web.yaml | 68 -------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 .github/workflows/web.yaml diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml deleted file mode 100644 index 7f673590bd6..00000000000 --- a/.github/workflows/web.yaml +++ /dev/null @@ -1,68 +0,0 @@ -# Separate workflow for the wasmer-web crate. -# - -name: Wasmer Web - -on: - push: - branches: - - main - pull_request: - -# Automatically cancel previous workflow runs when a new commit is pushed. -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - CARGO_NET_GIT_FETCH_WITH_CLI: "true" - -jobs: - web: - name: Build and Test (wasmer-web) - runs-on: ubuntu-latest - defaults: - run: - working-directory: lib/wasi-web - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Rust Cache - uses: Swatinem/rust-cache@v2 - - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - with: - toolchain: nightly-2023-05-25 - - - name: Install wasm-pack - uses: taiki-e/install-action@v2 - with: - tool: wasm-pack - - - name: Setup Chromedriver - uses: nanasess/setup-chromedriver@v2 - - - name: Show Rust version - run: rustc --version --verbose - - - name: Check formatting - shell: bash - run: cargo fmt --check - - - name: Check - run: cargo check --verbose --locked - - - name: Browser Integration Tests - run: | - set -xe - npm install - npm run build - npm run dev & - NPM_PID=$! - # Give the webpack dev server time to start - sleep 10 - - cd ../../tests/wasmer-web - cargo test --verbose --locked -- --test-threads=1