Skip to content

Commit d1c1b09

Browse files
committed
Merge branch 'apache_main' into follow-up/monotonic
2 parents 808b667 + 28c97fc commit d1c1b09

File tree

481 files changed

+12347
-6339
lines changed

Some content is hidden

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

481 files changed

+12347
-6339
lines changed

.github/dependabot.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,29 @@ updates:
2121
directory: "/"
2222
schedule:
2323
interval: daily
24-
open-pull-requests-limit: 10
2524
target-branch: main
2625
labels: [auto-dependencies]
2726
ignore:
28-
# arrow is bumped manually
27+
# major version bumps of arrow* and parquet are handled manually
2928
- dependency-name: "arrow*"
3029
update-types: ["version-update:semver-major"]
30+
- dependency-name: "parquet"
31+
update-types: ["version-update:semver-major"]
32+
groups:
33+
# minor and patch bumps of arrow* and parquet are grouped
34+
arrow-parquet:
35+
applies-to: version-updates
36+
patterns:
37+
- "arrow*"
38+
- "parquet"
39+
update-types:
40+
- "minor"
41+
- "patch"
42+
proto:
43+
applies-to: version-updates
44+
patterns:
45+
- "prost*"
46+
- "pbjson*"
3147
- package-ecosystem: "github-actions"
3248
directory: "/"
3349
schedule:

.github/workflows/extended.yml

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,34 @@ jobs:
4848
with:
4949
rust-version: stable
5050
- name: Prepare cargo build
51-
run: cargo check --profile ci --all-targets
51+
run: |
52+
cargo check --profile ci --all-targets
53+
cargo clean
5254
53-
# Run extended tests (with feature 'extended_tests')
54-
linux-test-extended:
55-
name: cargo test 'extended_tests' (amd64)
56-
needs: linux-build-lib
57-
runs-on: ubuntu-latest
58-
container:
59-
image: amd64/rust
60-
steps:
61-
- uses: actions/checkout@v4
62-
with:
63-
submodules: true
64-
fetch-depth: 1
65-
- name: Setup Rust toolchain
66-
uses: ./.github/actions/setup-builder
67-
with:
68-
rust-version: stable
69-
- name: Run tests (excluding doctests)
70-
run: cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --workspace --lib --tests --bins --features avro,json,backtrace,extended_tests
71-
- name: Verify Working Directory Clean
72-
run: git diff --exit-code
55+
# # Run extended tests (with feature 'extended_tests')
56+
# # Disabling as it is running out of disk space
57+
# # see https://github.com/apache/datafusion/issues/14576
58+
# linux-test-extended:
59+
# name: cargo test 'extended_tests' (amd64)
60+
# needs: linux-build-lib
61+
# runs-on: ubuntu-latest
62+
# container:
63+
# image: amd64/rust
64+
# steps:
65+
# - uses: actions/checkout@v4
66+
# with:
67+
# submodules: true
68+
# fetch-depth: 1
69+
# - name: Setup Rust toolchain
70+
# uses: ./.github/actions/setup-builder
71+
# with:
72+
# rust-version: stable
73+
# - name: Run tests (excluding doctests)
74+
# run: cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --workspace --lib --tests --bins --features avro,json,backtrace,extended_tests
75+
# - name: Verify Working Directory Clean
76+
# run: git diff --exit-code
77+
# - name: Cleanup
78+
# run: cargo clean
7379

7480
# Check answers are correct when hash values collide
7581
hash-collisions:
@@ -90,6 +96,7 @@ jobs:
9096
run: |
9197
cd datafusion
9298
cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --exclude datafusion-sqllogictest --workspace --lib --tests --features=force_hash_collisions,avro,extended_tests
99+
cargo clean
93100
94101
sqllogictest-sqlite:
95102
name: "Run sqllogictests with the sqlite test suite"
@@ -106,4 +113,8 @@ jobs:
106113
with:
107114
rust-version: stable
108115
- name: Run sqllogictest
109-
run: cargo test --profile release-nonlto --test sqllogictests -- --include-sqlite
116+
run: |
117+
cargo test --profile release-nonlto --test sqllogictests -- --include-sqlite
118+
cargo clean
119+
120+

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ on:
4141
jobs:
4242
# Check license header
4343
license-header-check:
44-
runs-on: ubuntu-20.04
44+
runs-on: ubuntu-latest
4545
name: Check License Header
4646
steps:
4747
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)