From 64e9a46dc7deb82aab6a213fd746f1632c1cc444 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Thu, 25 Apr 2024 07:52:18 -0700 Subject: [PATCH] chore(dev): Bump down zstd-sys from 2.0.10 to 2.0.9 (#20369) * chore(dev): Bump down zstd-sys from 2.0.10 to 2.0.9 To fix a WASM build issue. We can upgrade again once https://github.com/gyscos/zstd-rs/pull/274 is merged and released (or https://github.com/gyscos/zstd-rs/issues/271 is otherwise fixed). Also add a test that builds the playground to catch this sort of regression in the future. Signed-off-by: Jesse Szwedko * Revert "chore(deps): Bump the zstd group with 1 update (#20199)" This reverts commit 0599d60758386b631533adce250b4820f5434e59. Signed-off-by: Jesse Szwedko * chmod +x Signed-off-by: Jesse Szwedko * Just put directly in env prepare Signed-off-by: Jesse Szwedko * Bump timeout Signed-off-by: Jesse Szwedko --------- Signed-off-by: Jesse Szwedko --- .github/workflows/test.yml | 8 +++++++- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 4 ++-- scripts/ensure-wasm-pack-installed.sh | 0 scripts/environment/prepare.sh | 9 +++++++++ 5 files changed, 29 insertions(+), 14 deletions(-) mode change 100644 => 100755 scripts/ensure-wasm-pack-installed.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1201184f1c986..5a53114a6b9a9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: checks: name: Checks runs-on: ubuntu-20.04-8core - timeout-minutes: 45 + timeout-minutes: 60 needs: changes env: CARGO_INCREMENTAL: 0 @@ -123,6 +123,12 @@ jobs: if: needs.changes.outputs.source == 'true' || needs.changes.outputs.cue == 'true' run: cargo vdev test-vrl + - name: Build VRL Playground + if: needs.changes.outputs.source == 'true' || needs.changes.outputs.dependencies == 'true' + run: | + cd lib/vector-vrl/web-playground/ + wasm-pack build --target web --out-dir public/pkg + # This is a required status check, so it always needs to run if prior jobs failed, in order to mark the status correctly. all-checks: name: Test Suite diff --git a/Cargo.lock b/Cargo.lock index 3136cf5b7c424..40821066d66af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -368,8 +368,8 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "zstd 0.13.1", - "zstd-safe 7.1.0", + "zstd 0.13.0", + "zstd-safe 7.0.0", ] [[package]] @@ -10269,7 +10269,7 @@ dependencies = [ "warp", "windows-service", "wiremock", - "zstd 0.13.1", + "zstd 0.13.0", ] [[package]] @@ -10706,7 +10706,7 @@ dependencies = [ "uuid", "webbrowser", "woothee", - "zstd 0.13.1", + "zstd 0.13.0", ] [[package]] @@ -11355,11 +11355,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 7.1.0", + "zstd-safe 7.0.0", ] [[package]] @@ -11374,18 +11374,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 7e62a1fc8482f..8a29485972357 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -342,7 +342,7 @@ typetag = { version = "0.2.16", default-features = false } url = { version = "2.5.0", default-features = false, features = ["serde"] } uuid = { version = "1", default-features = false, features = ["serde", "v4"] } warp = { version = "0.3.7", default-features = false } -zstd = { version = "0.13.1", default-features = false } +zstd = { version = "0.13.0", default-features = false } arr_macro = { version = "0.2.1" } # depending on fork for bumped nix dependency @@ -390,7 +390,7 @@ vector-lib = { path = "lib/vector-lib", default-features = false, features = ["v vrl.workspace = true wiremock = "0.5.22" -zstd = { version = "0.13.1", default-features = false } +zstd = { version = "0.13.0", default-features = false } [patch.crates-io] # The upgrade for `tokio-util` >= 0.6.9 is blocked on https://github.com/vectordotdev/vector/issues/11257. diff --git a/scripts/ensure-wasm-pack-installed.sh b/scripts/ensure-wasm-pack-installed.sh old mode 100644 new mode 100755 diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh index 369bee8e2cae4..3fdd970b5e6f1 100755 --- a/scripts/environment/prepare.sh +++ b/scripts/environment/prepare.sh @@ -21,6 +21,15 @@ if ! dd-rust-license-tool --help >& /dev/null ; then rustup run stable cargo install dd-rust-license-tool --version 1.0.2 --force --locked fi +if [[ "$(wasm-pack --version)" != "wasm-pack 0.10.3" ]] ; then + echo "wasm-pack version 0.10.3 is not installed" + # We are using the version from git due to the bug: https://github.com/vectordotdev/vector/pull/16060#issuecomment-1428429602 + echo "running cargo install --git https://github.com/rustwasm/wasm-pack.git --rev e3582b7 wasm-pack" + cargo install --git https://github.com/rustwasm/wasm-pack.git --rev e3582b7 wasm-pack +else + echo "wasm-pack version 0.10.3 is installed already" +fi + # Currently fixing this to version 0.30 since version 0.31 has introduced # a change that means it only works with versions of node > 10. # https://github.com/igorshubovych/markdownlint-cli/issues/258