Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into dependabot/github_actions/…
Browse files Browse the repository at this point in the history
…docker/setup-qemu-action-3.6.0
  • Loading branch information
pront committed Mar 4, 2025
2 parents 646d87c + e1dce44 commit 1ec80eb
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/k8s_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
- run: sudo -E bash scripts/ci-free-disk-space.sh
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
- run: bash scripts/environment/prepare.sh
- run: ~/.cargo/bin/rustup target add x86_64-unknown-linux-gnu
- run: echo "::add-matcher::.github/matchers/rust.json"
- run: VECTOR_VERSION="$(cargo vdev version)" make package-deb-x86_64-unknown-linux-gnu

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/msrv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
- run: |
# We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain.
rustup show active-toolchain || rustup toolchain install
- run: cargo install cargo-msrv --version 0.15.1
- run: cargo msrv verify
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ jobs:
if: needs.changes.outputs.source == 'true' || needs.changes.outputs.dependencies == 'true'
run: |
cd lib/vector-vrl/web-playground/
~/.cargo/bin/rustup target add wasm32-unknown-unknown
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.
Expand Down
4 changes: 2 additions & 2 deletions scripts/environment/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ set -e -o verbose

git config --global --add safe.directory /git/vectordotdev/vector

rustup show # causes installation of version from rust-toolchain.toml
rustup default "$(rustup show active-toolchain | awk '{print $1;}')"
rustup show active-toolchain || rustup toolchain install
rustup show
if [[ "$(cargo-deb --version)" != "2.0.2" ]] ; then
rustup run stable cargo install cargo-deb --version 2.0.0 --force --locked
fi
Expand Down
2 changes: 2 additions & 0 deletions src/sources/host_metrics/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ mod tests {
assert_eq!(*tcp_stats.conn_states.get("syn_recv").unwrap(), 1.0);
}

#[ignore]
/// These tests are flakey and need reworking.
/// This is a workaround for running these tests serially.
/// The `generates_tcp_metrics` test internally calls `fetch_nl_inet_hdrs` and reads
/// from the same socket as the `fetches_nl_net_hdrs` test.
Expand Down

0 comments on commit 1ec80eb

Please sign in to comment.