Skip to content

Commit 7dd87e0

Browse files
committed
Merge develop into ngates/normalize-execution
Resolve conflicts keeping the HashSet<ArrayId>-based allowed encodings approach from this branch. Remove duplicate with_slots method from auto-merge and clean up unused imports. Signed-off-by: Joe Isaacs <joe@spiraldb.com>
2 parents 58fd4cd + 6c7eb33 commit 7dd87e0

657 files changed

Lines changed: 18130 additions & 15312 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.

.github/actions/setup-rust/action.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ runs:
8484
if: runner.os != 'Windows'
8585
uses: ./.github/actions/setup-protoc
8686

87-
- name: Install Ninja (for DuckDB build system)
88-
uses: seanmiddleditch/gha-setup-ninja@v6
89-
9087
- name: Install Sweep
9188
shell: bash
9289
if: ${{ inputs.timestamp == 'true' && github.ref_name == 'develop' }}

.github/workflows/approvals.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ name: PR Approval Check
33
on:
44
pull_request_review:
55
types: [submitted, dismissed]
6-
pull_request:
7-
types: [opened, synchronize, reopened]
86

97
jobs:
108
check-approvals:
119
runs-on: ubuntu-latest
1210
steps:
1311
- name: Check required approvals
14-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd
12+
uses: actions/github-script@450193c5abd4cdb17ba9f3ffcfe8f635c4bb6c2a
1513
with:
1614
script: |
1715
const pr = context.payload.pull_request;

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ jobs:
741741
- uses: ./.github/actions/setup-prebuild
742742
- uses: ./.github/actions/system-info
743743
- name: Install Codspeed
744-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
744+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
745745
with:
746746
tool: cargo-codspeed
747747
- name: Build benchmarks
@@ -977,7 +977,7 @@ jobs:
977977
- uses: actions/checkout@v6
978978
- uses: ./.github/actions/setup-prebuild
979979
- name: Install cargo-edit
980-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
980+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
981981
with:
982982
tool: cargo-edit
983983
- name: Set Version

.github/workflows/close-fixed-fuzzer-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
compiler: llvm
5050

5151
- name: Install cargo-fuzz
52-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
52+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
5353
with:
5454
tool: cargo-fuzz
5555

.github/workflows/fuzz-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
echo "Found llvm-profdata at $LLVM_PROFDATA"
5151
5252
- name: Install cargo-fuzz
53-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
53+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
5454
with:
5555
tool: cargo-fuzz
5656

.github/workflows/fuzzer-fix-automation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
compiler: llvm
7070

7171
- name: Install cargo-fuzz
72-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
72+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
7373
with:
7474
tool: cargo-fuzz
7575

.github/workflows/minimize_fuzz_corpus_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
5959

6060
- name: Install cargo-fuzz
61-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
61+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
6262
with:
6363
tool: cargo-fuzz
6464

.github/workflows/package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
enable-sccache: "false"
4343

4444
- name: Install cargo-edit
45-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
45+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
4646
with:
4747
tool: cargo-edit
4848

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
repo-token: ${{ secrets.GITHUB_TOKEN }}
3232
enable-sccache: "false"
3333
- name: Install cargo-edit
34-
uses: taiki-e/cache-cargo-install-action@511847d4974b3aed52d8daf28cbea5313caf34f3
34+
uses: taiki-e/cache-cargo-install-action@66c9585ef5ca780ee69399975a5e911f47905995
3535
with:
3636
tool: cargo-edit
3737

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ jobs:
2626
contents: write
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: release-drafter/release-drafter@v6.4.0
30-
env:
31-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
- uses: release-drafter/release-drafter@v7.1.1
3230
with:
3331
commitish: ${{ github.ref_name }}
3432
prerelease: ${{ github.event_name == 'workflow_dispatch' }}

0 commit comments

Comments
 (0)