Skip to content

Commit

Permalink
Merge branch 'apache_main' into follow-up/monotonic
Browse files Browse the repository at this point in the history
  • Loading branch information
berkaysynnada committed Feb 21, 2025
2 parents 808b667 + 28c97fc commit d1c1b09
Show file tree
Hide file tree
Showing 481 changed files with 12,347 additions and 6,339 deletions.
20 changes: 18 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,29 @@ updates:
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
target-branch: main
labels: [auto-dependencies]
ignore:
# arrow is bumped manually
# major version bumps of arrow* and parquet are handled manually
- dependency-name: "arrow*"
update-types: ["version-update:semver-major"]
- dependency-name: "parquet"
update-types: ["version-update:semver-major"]
groups:
# minor and patch bumps of arrow* and parquet are grouped
arrow-parquet:
applies-to: version-updates
patterns:
- "arrow*"
- "parquet"
update-types:
- "minor"
- "patch"
proto:
applies-to: version-updates
patterns:
- "prost*"
- "pbjson*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
55 changes: 33 additions & 22 deletions .github/workflows/extended.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,34 @@ jobs:
with:
rust-version: stable
- name: Prepare cargo build
run: cargo check --profile ci --all-targets
run: |
cargo check --profile ci --all-targets
cargo clean
# Run extended tests (with feature 'extended_tests')
linux-test-extended:
name: cargo test 'extended_tests' (amd64)
needs: linux-build-lib
runs-on: ubuntu-latest
container:
image: amd64/rust
steps:
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 1
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
with:
rust-version: stable
- name: Run tests (excluding doctests)
run: cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --workspace --lib --tests --bins --features avro,json,backtrace,extended_tests
- name: Verify Working Directory Clean
run: git diff --exit-code
# # Run extended tests (with feature 'extended_tests')
# # Disabling as it is running out of disk space
# # see https://github.com/apache/datafusion/issues/14576
# linux-test-extended:
# name: cargo test 'extended_tests' (amd64)
# needs: linux-build-lib
# runs-on: ubuntu-latest
# container:
# image: amd64/rust
# steps:
# - uses: actions/checkout@v4
# with:
# submodules: true
# fetch-depth: 1
# - name: Setup Rust toolchain
# uses: ./.github/actions/setup-builder
# with:
# rust-version: stable
# - name: Run tests (excluding doctests)
# run: cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --workspace --lib --tests --bins --features avro,json,backtrace,extended_tests
# - name: Verify Working Directory Clean
# run: git diff --exit-code
# - name: Cleanup
# run: cargo clean

# Check answers are correct when hash values collide
hash-collisions:
Expand All @@ -90,6 +96,7 @@ jobs:
run: |
cd datafusion
cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --exclude datafusion-sqllogictest --workspace --lib --tests --features=force_hash_collisions,avro,extended_tests
cargo clean
sqllogictest-sqlite:
name: "Run sqllogictests with the sqlite test suite"
Expand All @@ -106,4 +113,8 @@ jobs:
with:
rust-version: stable
- name: Run sqllogictest
run: cargo test --profile release-nonlto --test sqllogictests -- --include-sqlite
run: |
cargo test --profile release-nonlto --test sqllogictests -- --include-sqlite
cargo clean
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ on:
jobs:
# Check license header
license-header-check:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
name: Check License Header
steps:
- uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit d1c1b09

Please sign in to comment.