diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2cf4e76f..dbdf76aa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,12 +36,15 @@ jobs: toolchain: ${{matrix.rust}} - name: Run tests run: | + apt update + apt install -y libssl-dev cargo check -p volo-thrift --no-default-features cargo check -p volo-thrift --no-default-features --features multiplex cargo check -p volo-thrift --no-default-features --features unsafe-codec cargo check -p volo-grpc --no-default-features cargo check -p volo-grpc --no-default-features --features rustls - cargo check -p volo-grpc --no-default-features --features native-tls,vendored + cargo check -p volo-grpc --no-default-features --features native-tls + cargo check -p volo-grpc --no-default-features --features native-tls-vendored cargo check -p volo-http --no-default-features cargo check -p volo-http --no-default-features --features default_client cargo check -p volo-http --no-default-features --features default_server @@ -64,12 +67,15 @@ jobs: toolchain: ${{matrix.rust}} - name: Run tests run: | + apt update + apt install -y libssl-dev cargo check -p volo-thrift --no-default-features cargo check -p volo-thrift --no-default-features --features multiplex cargo check -p volo-thrift --no-default-features --features unsafe-codec cargo check -p volo-grpc --no-default-features cargo check -p volo-grpc --no-default-features --features rustls - cargo check -p volo-grpc --no-default-features --features native-tls,vendored + cargo check -p volo-grpc --no-default-features --features native-tls + cargo check -p volo-grpc --no-default-features --features native-tls-vendored cargo check -p volo-http --no-default-features cargo check -p volo-http --no-default-features --features default_client cargo check -p volo-http --no-default-features --features default_server @@ -98,7 +104,8 @@ jobs: cargo check -p volo-thrift --no-default-features --features unsafe-codec cargo check -p volo-grpc --no-default-features cargo check -p volo-grpc --no-default-features --features rustls - cargo check -p volo-grpc --no-default-features --features native-tls,vendored + cargo check -p volo-grpc --no-default-features --features native-tls + cargo check -p volo-grpc --no-default-features --features native-tls-vendored cargo check -p volo-http --no-default-features cargo check -p volo-http --no-default-features --features default_client cargo check -p volo-http --no-default-features --features default_server @@ -127,7 +134,8 @@ jobs: cargo check -p volo-thrift --no-default-features --features unsafe-codec cargo check -p volo-grpc --no-default-features cargo check -p volo-grpc --no-default-features --features rustls - cargo check -p volo-grpc --no-default-features --features native-tls,vendored + cargo check -p volo-grpc --no-default-features --features native-tls + cargo check -p volo-grpc --no-default-features --features native-tls-vendored cargo check -p volo-http --no-default-features cargo check -p volo-http --no-default-features --features default_client cargo check -p volo-http --no-default-features --features default_server diff --git a/volo-grpc/Cargo.toml b/volo-grpc/Cargo.toml index c83a09c0..eb66a67f 100644 --- a/volo-grpc/Cargo.toml +++ b/volo-grpc/Cargo.toml @@ -72,5 +72,6 @@ tracing-subscriber.workspace = true [features] default = [] -rustls = ["tokio-rustls"] -native-tls = ["tokio-native-tls"] +rustls = ["tokio-rustls", "volo/rustls"] +native-tls = ["tokio-native-tls", "volo/native-tls"] +native-tls-vendored = ["native-tls", "volo/native-tls-vendored"] diff --git a/volo/Cargo.toml b/volo/Cargo.toml index 5647972c..a0ae6085 100644 --- a/volo/Cargo.toml +++ b/volo/Cargo.toml @@ -58,6 +58,7 @@ tokio-native-tls = { workspace = true, optional = true } [features] default = [] -vendored = ["tokio-native-tls/vendored"] rustls = ["tokio-rustls", "librustls"] + native-tls = ["tokio-native-tls"] +native-tls-vendored = ["native-tls", "tokio-native-tls/vendored"] diff --git a/volo/src/net/dial.rs b/volo/src/net/dial.rs index 16c6b76f..5fbf838f 100644 --- a/volo/src/net/dial.rs +++ b/volo/src/net/dial.rs @@ -215,6 +215,7 @@ cfg_rustls_or_native_tls! { async fn call(&self, addr: Address) -> Result { match addr { Address::Ip(addr) => { + #[allow(unused_variables)] let tcp = make_tcp_connection(&self.cfg, addr).await?; match &self.tls_config.connector {