Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(dev): Bump down zstd-sys from 2.0.10 to 2.0.9 #20369

Merged
merged 5 commits into from
Apr 25, 2024
Merged

chore(dev): Bump down zstd-sys from 2.0.10 to 2.0.9 #20369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05e97c3
chore(dev): Bump down zstd-sys from 2.0.10 to 2.0.9
jszwedko Apr 24, 2024
67e0958
Revert "chore(deps): Bump the zstd group with 1 update (#20199)"
jszwedko Apr 24, 2024
878fd4d
chmod +x
jszwedko Apr 25, 2024
b3ad6ca
Just put directly in env prepare
jszwedko Apr 25, 2024
8f8d7ce
Bump timeout
jszwedko Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
Empty file modified scripts/ensure-wasm-pack-installed.sh
100644 → 100755
View file
Open in desktop
Empty file.
9 changes: 9 additions & 0 deletions scripts/environment/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading