diff --git a/.github/workflows/truss-transfer-build-maturin.yaml b/.github/workflows/truss-transfer-build-maturin.yaml index aebf2d64e..14840dc01 100644 --- a/.github/workflows/truss-transfer-build-maturin.yaml +++ b/.github/workflows/truss-transfer-build-maturin.yaml @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: 3.x - - name: Build wheels (non-aarch64) + - name: Build wheels uses: PyO3/maturin-action@v1 with: working-directory: truss-transfer diff --git a/truss-transfer/Cargo.lock b/truss-transfer/Cargo.lock index c3543144a..e2ab792fa 100644 --- a/truss-transfer/Cargo.lock +++ b/truss-transfer/Cargo.lock @@ -38,12 +38,6 @@ version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "autocfg" version = "1.4.0" @@ -158,15 +152,6 @@ dependencies = [ "syn", ] -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -300,25 +285,6 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -[[package]] -name = "h2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.15.2" @@ -380,7 +346,6 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2", "http", "http-body", "httparse", @@ -1014,11 +979,9 @@ checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64", "bytes", - "encoding_rs", "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", "http-body-util", @@ -1042,7 +1005,6 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -1322,27 +1284,6 @@ dependencies = [ "syn", ] -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "target-lexicon" version = "0.12.16" diff --git a/truss-transfer/Cargo.toml b/truss-transfer/Cargo.toml index 5bd10ae12..b8c8034df 100644 --- a/truss-transfer/Cargo.toml +++ b/truss-transfer/Cargo.toml @@ -16,19 +16,17 @@ pyo3 = { version = "0.23.4", features = ["extension-module", "abi3-py38"] } serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.9" tokio = { version = "1.24", features = ["rt-multi-thread", "macros", "fs"] } -# Avoid openssl, to improve portability -# openssl = { version = "0.10", features = ["vendored"] } -# Default for non-aarch64 targets +# Default reqwest dependency with rustls for portability reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "stream", "rustls-tls"] } -[target.'cfg(target_arch = "aarch64")'.dependencies] -# https://github.com/briansmith/ring/issues/1789 -reqwest = { version = "0.12", features = ["blocking", "json", "stream"] } +# Use OpenSSL for all ARM-based architectures +[target.'cfg(any(target_arch = "aarch64", target_arch = "arm"))'.dependencies] +reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "stream", "default-tls"] } openssl = { version = "0.10", features = ["vendored"] } [features] -cli = [] # For the CLI +cli = [] # For the CLI [[bin]] name = "truss_transfer_cli"