Skip to content

Commit 76bbd0c

Browse files
committed
Merge branch 'main' into cascade-merge-spill
2 parents 6dbd7b0 + 2cba3ad commit 76bbd0c

File tree

198 files changed

+10740
-4285
lines changed

Some content is hidden

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

198 files changed

+10740
-4285
lines changed

.github/workflows/audit.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@ jobs:
4242
- name: Install cargo-audit
4343
run: cargo install cargo-audit
4444
- name: Run audit check
45-
run: cargo audit
45+
# Ignored until https://github.com/apache/datafusion/issues/15571
46+
# ignored py03 warning until arrow 55 upgrade
47+
run: cargo audit --ignore RUSTSEC-2024-0370 --ignore RUSTSEC-2025-0020

.github/workflows/extended.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on:
4747
permissions:
4848
contents: read
4949
checks: write
50-
50+
5151
jobs:
5252

5353
# Check crate compiles and base cargo check passes
@@ -58,6 +58,7 @@ jobs:
5858
steps:
5959
- uses: actions/checkout@v4
6060
with:
61+
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
6162
submodules: true
6263
fetch-depth: 1
6364
- name: Install Rust
@@ -81,6 +82,7 @@ jobs:
8182
steps:
8283
- uses: actions/checkout@v4
8384
with:
85+
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
8486
submodules: true
8587
fetch-depth: 1
8688
- name: Free Disk Space (Ubuntu)
@@ -114,6 +116,7 @@ jobs:
114116
steps:
115117
- uses: actions/checkout@v4
116118
with:
119+
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
117120
submodules: true
118121
fetch-depth: 1
119122
- name: Setup Rust toolchain
@@ -134,6 +137,7 @@ jobs:
134137
steps:
135138
- uses: actions/checkout@v4
136139
with:
140+
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
137141
submodules: true
138142
fetch-depth: 1
139143
- name: Setup Rust toolchain
@@ -161,14 +165,14 @@ jobs:
161165
echo "workflow_status=completed" >> $GITHUB_OUTPUT
162166
echo "conclusion=success" >> $GITHUB_OUTPUT
163167
fi
164-
168+
165169
- name: Update check run
166170
uses: actions/github-script@v7
167171
with:
168172
github-token: ${{ secrets.GITHUB_TOKEN }}
169173
script: |
170174
const workflowRunUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
171-
175+
172176
await github.rest.checks.update({
173177
owner: context.repo.owner,
174178
repo: context.repo.repo,

.github/workflows/pr_comment_commands.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
repo: context.repo.repo,
4545
pull_number: context.payload.issue.number
4646
});
47-
47+
4848
// Extract the branch name
4949
const branchName = pullRequest.head.ref;
5050
const headSha = pullRequest.head.sha;
5151
const workflowRunsUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions?query=workflow%3A%22Datafusion+extended+tests%22+branch%3A${branchName}`;
52-
52+
5353
// Create a check run that links to the Actions tab so the run will be visible in GitHub UI
5454
const check = await github.rest.checks.create({
5555
owner: context.repo.owner,
@@ -69,15 +69,15 @@ jobs:
6969
owner: context.repo.owner,
7070
repo: context.repo.repo,
7171
workflow_id: 'extended.yml',
72-
ref: branchName,
72+
ref: 'main',
7373
inputs: {
7474
pr_number: context.payload.issue.number.toString(),
7575
check_run_id: check.data.id.toString(),
7676
pr_head_sha: headSha
7777
}
7878
});
7979
80-
- name: Add reaction to comment
80+
- name: Add reaction to comment
8181
uses: actions/github-script@v7
8282
with:
8383
script: |
@@ -86,4 +86,4 @@ jobs:
8686
repo: context.repo.repo,
8787
comment_id: context.payload.comment.id,
8888
content: 'rocket'
89-
});
89+
});

.github/workflows/rust.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -384,25 +384,25 @@ jobs:
384384
run: ci/scripts/rust_docs.sh
385385

386386
linux-wasm-pack:
387-
name: build with wasm-pack
388-
runs-on: ubuntu-latest
389-
container:
390-
image: amd64/rust
387+
name: build and run with wasm-pack
388+
runs-on: ubuntu-24.04
391389
steps:
392390
- uses: actions/checkout@v4
393-
- name: Setup Rust toolchain
394-
uses: ./.github/actions/setup-builder
395-
with:
396-
rust-version: stable
391+
- name: Setup for wasm32
392+
run: |
393+
rustup target add wasm32-unknown-unknown
397394
- name: Install dependencies
398395
run: |
399-
apt-get update -qq
400-
apt-get install -y -qq clang
401-
- name: Install wasm-pack
402-
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
403-
- name: Build with wasm-pack
396+
sudo apt-get update -qq
397+
sudo apt-get install -y -qq clang
398+
- name: Setup wasm-pack
399+
run: |
400+
cargo install wasm-pack
401+
- name: Run tests with headless mode
404402
working-directory: ./datafusion/wasmtest
405-
run: wasm-pack build --dev
403+
run: |
404+
wasm-pack test --headless --firefox
405+
wasm-pack test --headless --chrome --chromedriver $CHROMEWEBDRIVER/chromedriver
406406
407407
# verify that the benchmark queries return the correct results
408408
verify-benchmark-results:
@@ -693,6 +693,11 @@ jobs:
693693
# If you encounter an error, run './dev/update_function_docs.sh' and commit
694694
./dev/update_function_docs.sh
695695
git diff --exit-code
696+
- name: Check if runtime_configs.md has been modified
697+
run: |
698+
# If you encounter an error, run './dev/update_runtime_config_docs.sh' and commit
699+
./dev/update_runtime_config_docs.sh
700+
git diff --exit-code
696701
697702
# Verify MSRV for the crates which are directly used by other projects:
698703
# - datafusion

0 commit comments

Comments
 (0)