Skip to content

Commit 158fcbf

Browse files
Merge branch 'main' into friendlymatthew/evaluate-projections-at-file-source-level
2 parents e859d20 + bea4b68 commit 158fcbf

File tree

44 files changed

+2583
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2583
-689
lines changed

.github/workflows/audit.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@c5b1b6f479c32f356cc6f4ba672a47f63853b13b # v2.62.38
45+
uses: taiki-e/install-action@41ef8c65f4034ff24ab1cc2cef52f3000bcf9523 # v2.62.40
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check
49-
# RUSTSEC-2025-0111: tokio-tar is by testcontainers for orchestration
50-
# of testing, so does not impact DataFusion's security
51-
# See https://github.com/apache/datafusion/issues/18288
52-
# NOTE: can remove this once testcontainers releases a version that includes
53-
# https://github.com/testcontainers/testcontainers-rs/pull/852
54-
run: cargo audit --ignore RUSTSEC-2025-0111
49+
run: cargo audit

.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ jobs:
425425
sudo apt-get update -qq
426426
sudo apt-get install -y -qq clang
427427
- name: Setup wasm-pack
428-
uses: taiki-e/install-action@c5b1b6f479c32f356cc6f4ba672a47f63853b13b # v2.62.38
428+
uses: taiki-e/install-action@41ef8c65f4034ff24ab1cc2cef52f3000bcf9523 # v2.62.40
429429
with:
430430
tool: wasm-pack
431431
- name: Run tests with headless mode
@@ -752,7 +752,7 @@ jobs:
752752
- name: Setup Rust toolchain
753753
uses: ./.github/actions/setup-builder
754754
- name: Install cargo-msrv
755-
uses: taiki-e/install-action@c5b1b6f479c32f356cc6f4ba672a47f63853b13b # v2.62.38
755+
uses: taiki-e/install-action@41ef8c65f4034ff24ab1cc2cef52f3000bcf9523 # v2.62.40
756756
with:
757757
tool: cargo-msrv
758758

Cargo.lock

Lines changed: 169 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)