Skip to content

Commit ca44737

Browse files
AdamGSAdamGS
authored
Merge branch 'main' into adamg/fix-23428
2 parents 33ef003 + 043d97f commit ca44737

564 files changed

Lines changed: 50888 additions & 15337 deletions

File tree

Some content is hidden

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

‎.asf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ github:
7878
- "cargo test (macos-aarch64)"
7979
- "Verify Vendored Code"
8080
- "Check cargo fmt"
81+
- "Check GitHub Actions install tooling"
8182
- "clippy"
8283
- "check Cargo.toml formatting"
8384
- "check configs.md and ***_functions.md is up-to-date"
@@ -114,4 +115,3 @@ github:
114115
# https://datafusion.apache.org/
115116
publish:
116117
whoami: asf-site
117-

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ updates:
6868
interval: "weekly"
6969
open-pull-requests-limit: 10
7070
labels: [auto-dependencies]
71+
groups:
72+
codeql-actions:
73+
patterns:
74+
- "github/codeql-action/*"
7175
- package-ecosystem: "pip"
7276
directory: "/docs"
7377
schedule:

‎.github/workflows/audit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
security_audit:
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
46+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4747
- name: Install cargo-audit
48-
uses: taiki-e/install-action@50414676f9f5d50a65992c6dd2ed02641263226c # v2.82.10
48+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
4949
with:
5050
tool: cargo-audit
5151
- name: Run audit check

‎.github/workflows/breaking_changes_detector.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Checkout
58-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
58+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5959
with:
6060
fetch-depth: 0
6161

@@ -89,7 +89,7 @@ jobs:
8989
9090
- name: Install cargo-semver-checks
9191
if: steps.changed_crates.outputs.packages != ''
92-
uses: taiki-e/install-action@50414676f9f5d50a65992c6dd2ed02641263226c # v2.82.10
92+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
9393
with:
9494
tool: cargo-semver-checks
9595

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
43+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4444
with:
4545
persist-credentials: false
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
48+
uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4
4949
with:
5050
languages: actions
5151

5252
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
53+
uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4
5454
with:
5555
category: "/language:actions"

‎.github/workflows/dependencies.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
container:
4343
image: amd64/rust
4444
steps:
45-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
45+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4646
with:
4747
submodules: true
4848
fetch-depth: 1
@@ -61,8 +61,10 @@ jobs:
6161
container:
6262
image: amd64/rust
6363
steps:
64-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
64+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6565
- name: Install cargo-machete
66-
run: cargo install cargo-machete --version ^0.9 --locked
66+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
67+
with:
68+
tool: cargo-machete@0.9
6769
- name: Detect unused dependencies
6870
run: cargo machete --with-metadata

‎.github/workflows/dev.yml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,20 @@ jobs:
3636
runs-on: ubuntu-latest
3737
name: Check License Header
3838
steps:
39-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
39+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4040
- name: Install HawkEye
41-
# This CI job is bound by installation time, use `--profile dev` to speed it up
42-
run: cargo install hawkeye --version 6.2.0 --locked --profile dev
41+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
42+
with:
43+
tool: hawkeye@6.2.0
4344
- name: Run license header check
4445
run: ci/scripts/license_header.sh
4546

4647
prettier:
4748
name: Use prettier to check formatting of documents
4849
runs-on: ubuntu-slim
4950
steps:
50-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
51-
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
51+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
52+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
5253
with:
5354
node-version: "20"
5455
- name: Prettier check
@@ -59,13 +60,13 @@ jobs:
5960
name: Check Markdown Links
6061
runs-on: ubuntu-latest
6162
steps:
62-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
63+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6364
- name: Load tool versions
6465
run: |
6566
source ci/scripts/utils/tool_versions.sh
6667
echo "LYCHEE_VERSION=${LYCHEE_VERSION}" >> "$GITHUB_ENV"
6768
- name: Install lychee
68-
uses: taiki-e/install-action@50414676f9f5d50a65992c6dd2ed02641263226c # v2.82.10
69+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
6970
with:
7071
tool: lychee@${{ env.LYCHEE_VERSION }}
7172
- name: Run markdown link check
@@ -75,21 +76,23 @@ jobs:
7576
name: Validate required_status_checks in .asf.yaml
7677
runs-on: ubuntu-latest
7778
steps:
78-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
79+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7980
- run: pip install pyyaml
8081
- run: python3 ci/scripts/check_asf_yaml_status_checks.py
8182

8283
typos:
8384
name: Spell Check with Typos
8485
runs-on: ubuntu-latest
8586
steps:
86-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
87+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
8788
with:
8889
persist-credentials: false
8990
# Version fixed on purpose. It uses heuristics to detect typos, so upgrading
9091
# it may cause checks to fail more often.
9192
# We can upgrade it manually once a while.
92-
- name: Install typos-cli
93-
run: cargo install typos-cli --locked --version 1.37.0
93+
- name: Install typos
94+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
95+
with:
96+
tool: typos@1.37.0
9497
- name: Run typos check
9598
run: ci/scripts/typos_check.sh

‎.github/workflows/docs.yaml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,28 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout docs sources
37-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
37+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3838

3939
- name: Checkout asf-site branch
40-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
40+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4141
with:
4242
ref: asf-site
4343
path: asf-site
4444

4545
- name: Setup uv
46-
uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
46+
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
4747

4848
- name: Install dependencies
4949
run: uv sync --package datafusion-docs
50-
- name: Install dependency graph tooling
50+
- name: Install Graphviz
5151
run: |
5252
set -x
5353
sudo apt-get update
5454
sudo apt-get install -y graphviz
55-
cargo install cargo-depgraph --version ^1.6 --locked
55+
- name: Install cargo-depgraph
56+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
57+
with:
58+
tool: cargo-depgraph@1.6
5659

5760
- name: Build docs
5861
run: |

‎.github/workflows/docs_pr.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,23 @@ jobs:
4545
name: Test doc build
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
48+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4949
with:
5050
submodules: true
5151
fetch-depth: 1
5252
- name: Setup uv
53-
uses: astral-sh/setup-uv@f98e06938123ccabd21905ea5d0069192241f9f1 # v8.3.1
53+
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
5454
- name: Install doc dependencies
5555
run: uv sync --package datafusion-docs
56-
- name: Install dependency graph tooling
56+
- name: Install Graphviz
5757
run: |
5858
set -x
5959
sudo apt-get update
6060
sudo apt-get install -y graphviz
61-
cargo install cargo-depgraph --version ^1.6 --locked
61+
- name: Install cargo-depgraph
62+
uses: taiki-e/install-action@41049aa56687c35e0afa74eed4f09cec4f9afabf # v2.85.2
63+
with:
64+
tool: cargo-depgraph@1.6
6265
- name: Build docs html and check for warnings
6366
run: |
6467
set -x

‎.github/workflows/extended.yml‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,23 @@ jobs:
6464
# note: do not use amd/rust container to preserve disk space
6565
steps:
6666
- uses: runs-on/action@4e5f72399b6b17f2e79c511c1b38a315a64d22dc # v2.2.0
67-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
67+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6868
with:
6969
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
7070
submodules: true
7171
fetch-depth: 1
7272
- name: Free Disk Space (Ubuntu)
7373
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
74-
- name: Install Rust
75-
run: |
76-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
77-
source $HOME/.cargo/env
78-
rustup toolchain install
79-
- name: Install Protobuf Compiler
80-
run: |
81-
sudo apt-get update
82-
sudo apt-get install -y protobuf-compiler
74+
- parallel:
75+
- name: Install Rust
76+
run: |
77+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
78+
source $HOME/.cargo/env
79+
rustup toolchain install
80+
- name: Install Protobuf Compiler
81+
run: |
82+
sudo apt-get update
83+
sudo apt-get install -y protobuf-compiler
8384
# For debugging, test binaries can be large.
8485
- name: Show available disk space
8586
run: |
@@ -98,10 +99,11 @@ jobs:
9899
--tests \
99100
--bins \
100101
--features avro,json,backtrace,extended_tests,recursive_protection,parquet_encryption
101-
- name: Verify Working Directory Clean
102-
run: git diff --exit-code
103-
- name: Cleanup
104-
run: cargo clean
102+
- parallel:
103+
- name: Verify Working Directory Clean
104+
run: git diff --exit-code
105+
- name: Cleanup
106+
run: cargo clean
105107

106108
# Check answers are correct when hash values collide
107109
hash-collisions:
@@ -111,7 +113,7 @@ jobs:
111113
image: amd64/rust
112114
steps:
113115
- uses: runs-on/action@4e5f72399b6b17f2e79c511c1b38a315a64d22dc # v2.2.0
114-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
116+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
115117
with:
116118
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
117119
submodules: true
@@ -133,15 +135,16 @@ jobs:
133135
image: amd64/rust
134136
steps:
135137
- uses: runs-on/action@4e5f72399b6b17f2e79c511c1b38a315a64d22dc # v2.2.0
136-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
137-
with:
138-
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
139-
submodules: true
140-
fetch-depth: 1
141-
# Don't use setup-builder to avoid configuring RUST_BACKTRACE which is expensive
142-
- name: Install protobuf compiler
143-
run: |
144-
apt-get update && apt-get install -y protobuf-compiler
138+
- parallel:
139+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
140+
with:
141+
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
142+
submodules: true
143+
fetch-depth: 1
144+
# Don't use setup-builder to avoid configuring RUST_BACKTRACE which is expensive
145+
- name: Install protobuf compiler
146+
run: |
147+
apt-get update && apt-get install -y protobuf-compiler
145148
- name: Run sqllogictest
146149
run: |
147-
cargo test --features backtrace,parquet_encryption --profile ci-optimized --test sqllogictests -- --include-sqlite
150+
cargo test --features backtrace,parquet_encryption --profile ci-optimized --test sqllogictests -- --include-sqlite

0 commit comments

Comments
 (0)