Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make rustls default across all packages #1097

Merged
merged 14 commits into from
Feb 11, 2023
Merged

Make rustls default across all packages #1097

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1655e28
make native-tls default consistent
wjones127 Jan 25, 2023
f4e483e
test from top level
wjones127 Jan 25, 2023
b1b1933
format
wjones127 Jan 25, 2023
0d02e77
Need native-tls
wjones127 Jan 25, 2023
419316f
what if we made rustls default
wjones127 Jan 25, 2023
4a59116
remove unneeded feature
wjones127 Jan 25, 2023
02ac90f
switch around feature names
wjones127 Jan 25, 2023
0dd3455
cleanup test commands
wjones127 Jan 26, 2023
ddefaf3
fix title
wjones127 Jan 26, 2023
ce8e92e
fix new clippy errors
wjones127 Feb 7, 2023
db25376
just integration test one package at a time
wjones127 Feb 7, 2023
929f6eb
drop extra feature
wjones127 Feb 7, 2023
8e07cc6
simplify path parsing
wjones127 Feb 11, 2023
b99e3be
fix env handling
wjones127 Feb 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
just integration test one package at a time
  • Loading branch information
@wjones127
wjones127 committed Feb 11, 2023
commit db25376748066a02577770616f383bee0e3b49d3
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: "1.64.0" # Switch to "stable" when the 1.67.0 release of https://github.com/rust-lang/rust is published, more information: https://github.com/delta-io/delta-rs/pull/923
toolchain: stable
override: true
- uses: Swatinem/rust-cache@v2
- name: build and lint with clippy
Expand Down Expand Up @@ -105,10 +105,10 @@ jobs:

- name: Run tests with rustls (default)
run: |
cargo test --features integration_test,azure,s3,gcs,datafusion
cargo test -p deltalake --features integration_test,azure,s3,gcs,datafusion
- name: Run tests with native-tls
run: |
cargo test --no-default-features --features integration_test,s3-native-tls,native-tls,datafusion
cargo test -p deltalake --no-default-features --features integration_test,s3-native-tls,native-tls,datafusion

parquet2_test:
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions aws/delta-checkpoint/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ path = "../../rust"
version = "0"

[dev-dependencies]
rusoto_core = { version = "0.48", default-features = false }
rusoto_credential = "0.48"
rusoto_s3 = { version = "0.48", default-features = false }
rusoto_core = { version = "0.47", default-features = false }
rusoto_credential = "0.47"
rusoto_s3 = { version = "0.47", default-features = false }

[features]
default = ["rustls"]
Expand Down
6 changes: 4 additions & 2 deletions dynamodb_lock/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ thiserror = "1"
log = "0"
uuid = { version = "1.2", features = ["serde", "v4"] }

rusoto_core = { version = "0.48", default-features = false }
rusoto_dynamodb = { version = "0.48", default-features = false }
# Waiting on fix for regression in 0.48:
# https://github.com/rusoto/rusoto/issues/1980
rusoto_core = { version = "0.47", default-features = false }
rusoto_dynamodb = { version = "0.47", default-features = false }
maplit = "1"
tokio = { version = "1", features = ["fs", "macros", "rt", "io-util"] }

Expand Down
10 changes: 5 additions & 5 deletions rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ uuid = { version = "1", features = ["serde", "v4"] }
url = "2.3"

# S3 lock client
rusoto_core = { version = "0.48", default-features = false, optional = true }
rusoto_credential = { version = "0.48", optional = true }
rusoto_sts = { version = "0.48", default-features = false, optional = true }
rusoto_dynamodb = { version = "0.48", default-features = false, optional = true }
rusoto_core = { version = "0.47", default-features = false, optional = true }
rusoto_credential = { version = "0.47", optional = true }
rusoto_sts = { version = "0.47", default-features = false, optional = true }
rusoto_dynamodb = { version = "0.47", default-features = false, optional = true }

# Glue
rusoto_glue = { version = "0.48", default-features = false, optional = true }
rusoto_glue = { version = "0.47", default-features = false, optional = true }

# Datafusion
datafusion = { version = "17", optional = true }
Expand Down