chore(dev): Bump down zstd-sys from 2.0.10 to 2.0.9 (vectordotdev#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 gyscos/zstd-rs#274 is merged and released (or gyscos/zstd-rs#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 <[email protected]> * Revert "chore(deps): Bump the zstd group with 1 update (vectordotdev#20199)" This reverts commit 0599d60. Signed-off-by: Jesse Szwedko <[email protected]> * chmod +x Signed-off-by: Jesse Szwedko <[email protected]> * Just put directly in env prepare Signed-off-by: Jesse Szwedko <[email protected]> * Bump timeout Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]>
discord · Sep 23, 2024 · 64e9a46 · 64e9a46
1 parent 13b68eb
commit 64e9a46
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git 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
diff --git 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
diff --git 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