Skip to content

Commit 6fb5b59

Browse files
committed
Merge remote-tracking branch 'upstream/main' into improve_topk
2 parents 923089f + cde8690 commit 6fb5b59

File tree

60 files changed

+1031
-306
lines changed

Some content is hidden

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

60 files changed

+1031
-306
lines changed

.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+
});

0 commit comments

Comments
 (0)