Skip to content

Commit

Permalink
Merge branch 'main' into write_deltalake_predicate_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sherlockbeard authored Sep 9, 2024
2 parents 8e611cb + b3b22ce commit 0e933a3
Show file tree
Hide file tree
Showing 15 changed files with 433 additions and 172 deletions.
44 changes: 36 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
branches: [main, "rust-v*"]
merge_group:

env:
DEFAULT_FEATURES: "azure,datafusion,s3,gcs,glue,hdfs "

jobs:
format:
runs-on: ubuntu-latest
Expand All @@ -17,12 +20,37 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
toolchain: '1.80'
override: true

- name: Format
run: cargo fmt -- --check

coverage:
runs-on: ubuntu-latest
env:
CARGO_TERM_COLOR: always
steps:
- uses: actions/checkout@v4
- name: Install rust
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: '1.80'
override: true
- name: Install cargo-llvm-cov
uses: taiki-e/install-action@cargo-llvm-cov
- uses: Swatinem/rust-cache@v2
- name: Generate code coverage
run: cargo llvm-cov --features ${DEFAULT_FEATURES} --workspace --codecov --output-path codecov.json -- --skip read_table_version_hdfs
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
files: codecov.json
fail_ci_if_error: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

build:
strategy:
fail-fast: false
Expand All @@ -39,17 +67,17 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
toolchain: '1.80'
override: true

- name: build and lint with clippy
run: cargo clippy --features azure,datafusion,s3,gcs,glue,hdfs --tests
run: cargo clippy --features ${{ env.DEFAULT_FEATURES }} --tests

- name: Spot-check build for native-tls features
run: cargo clippy --no-default-features --features azure,datafusion,s3-native-tls,gcs,glue --tests

- name: Check docs
run: cargo doc --features azure,datafusion,s3,gcs,glue,hdfs
run: cargo doc --features ${{ env.DEFAULT_FEATURES }}

- name: Check no default features (except rustls)
run: cargo check --no-default-features --features rustls
Expand All @@ -76,11 +104,11 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: "stable"
toolchain: '1.80'
override: true

- name: Run tests
run: cargo test --verbose --features datafusion,azure
run: cargo test --verbose --features ${{ env.DEFAULT_FEATURES }}

integration_test:
name: Integration Tests
Expand Down Expand Up @@ -110,7 +138,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
toolchain: '1.80'
override: true

# Install Java and Hadoop for HDFS integration tests
Expand All @@ -130,7 +158,7 @@ jobs:

- name: Run tests with rustls (default)
run: |
cargo test --features integration_test,azure,s3,gcs,datafusion,hdfs
cargo test --features integration_test,${{ env.DEFAULT_FEATURES }}
- name: Run tests with native-tls
run: |
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"

[workspace.package]
authors = ["Qingping Hou <[email protected]>"]
rust-version = "1.75"
rust-version = "1.80"
keywords = ["deltalake", "delta", "datalake"]
readme = "README.md"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion crates/aws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tokio = { workspace = true }
regex = { workspace = true }
uuid = { workspace = true, features = ["serde", "v4"] }
url = { workspace = true }
backoff = { version = "0.4", features = [ "tokio" ] }
backon = { version = "1",default-features = false, features = [ "tokio-sleep" ] }
hyper-tls = { version = "0.5", optional = true }

[dev-dependencies]
Expand Down
Loading

0 comments on commit 0e933a3

Please sign in to comment.