Skip to content

Commit

Permalink
awc with rustls on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
pwalski committed Dec 21, 2023
1 parent b78b1c7 commit d3983bc
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions exe-unit/components/transfer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ actix-http = "3"
actix-web = "4"
actix-rt = "2.7"
anyhow = "1.0"
awc = { version = "3.0", features = ["openssl"] }
# async-compression 0.3.8+ deprecates the "stream" module
async-compression = { version = "=0.3.7", features = ["tokio", "futures-io", "stream", "bzip2", "gzip", "xz"] }
bytes = "1.0"
Expand All @@ -44,6 +43,15 @@ url = "2.1.1"
walkdir = "2.3.1"
async-trait = "0.1.74"

[target.'cfg(target_family = "unix")'.dependencies]
awc = { version = "3", features = ["openssl"] }

[target.'cfg(target_os = "macos")'.dependencies]
awc = { version = "3", features = ["openssl"] }

[target.'cfg(target_os = "windows")'.dependencies]
awc = { version = "3", features = ["rustls-0_21"] }

[features]
sgx = [
'ya-client-model/sgx',
Expand Down Expand Up @@ -72,4 +80,3 @@ test-context = "0.1.4"

ya-framework-basic = { version = "0.1" }
ya-exe-unit = { version = "0.4", path = "../../../exe-unit" }

11 changes: 8 additions & 3 deletions test-utils/test-framework/framework-basic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ actix-http = "3"
actix-web = "4"
actix-rt = "2.7"
anyhow = "1.0"
awc = { version = "3.0", features = ["openssl"] }
# async-compression 0.3.8+ deprecates the "stream" module
async-compression = { version = "=0.3.7", features = ["tokio", "futures-io", "stream", "bzip2", "gzip", "xz"] }
bytes = "1.0"
Expand Down Expand Up @@ -48,6 +47,14 @@ url = "2.1.1"
walkdir = "2.3.1"
async-trait = "0.1.74"

[target.'cfg(target_family = "unix")'.dependencies]
awc = { version = "3", features = ["openssl"] }

[target.'cfg(target_os = "macos")'.dependencies]
awc = { version = "3", features = ["openssl"] }

[target.'cfg(target_os = "windows")'.dependencies]
awc = { version = "3", features = ["rustls-0_21"] }

[dependencies.zip]
version = "0.5.6"
Expand All @@ -56,5 +63,3 @@ git = "https://github.com/golemfactory/zip-rs.git"
branch = "feature/tokio-1"

[dev-dependencies]


0 comments on commit d3983bc

Please sign in to comment.