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

Jump to bottom

fix(volo-grpc): ci fail #367

Merged
merged 1 commit into from
Feb 19, 2024
+18 −7
Merged

fix(volo-grpc): ci fail #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions volo-grpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
3 changes: 2 additions & 1 deletion volo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 1 addition & 0 deletions volo/src/net/dial.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ cfg_rustls_or_native_tls! {
async fn call(&self, addr: Address) -> Result<Self::Response, Self::Error> {
match addr {
Address::Ip(addr) => {
#[allow(unused_variables)]
let tcp = make_tcp_connection(&self.cfg, addr).await?;

match &self.tls_config.connector {
Expand Down
Loading