actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-26 19:47:43 +02:00
Code Issues Releases Wiki Activity

update ci (#284)

Browse Source
This commit is contained in:
Rob Ede
2021-02-24 09:48:41 +00:00
committed by GitHub
parent 6e590fd042
commit 789e6a8a46
11 changed files with 172 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
actix-tls/Cargo.toml
View File

@ -52,7 +52,7 @@ log = "0.4"
tokio-util = { version = "0.6.3", default-features = false }
# openssl
tls-openssl = { package = "openssl", version = "0.10", optional = true }
tls-openssl = { package = "openssl", version = "0.10.9", optional = true }
tokio-openssl = { version = "0.6", optional = true }
# rustls
@ -62,6 +62,12 @@ webpki-roots = { version = "0.21", optional = true }
# native-tls
tokio-native-tls = { version = "0.3", optional = true }
[target.'cfg(windows)'.dependencies.tls-openssl]
version = "0.10.9"
package = "openssl"
features = ["vendored"]
optional = true
[dev-dependencies]
actix-rt = "2.0.0"
actix-server = "2.0.0-beta.3"

4
actix-tls/tests/test_connect.rs
View File

@ -1,3 +1,5 @@
#![cfg(feature = "connect")]
use std::{
io,
net::{IpAddr, Ipv4Addr},
@ -12,7 +14,7 @@ use futures_util::sink::SinkExt;
use actix_tls::connect::{self as actix_connect, Connect};
#[cfg(all(feature = "connect", feature = "openssl"))]
#[cfg(feature = "openssl")]
#[actix_rt::test]
async fn test_string() {
let srv = TestServer::with(|| {

2
actix-tls/tests/test_resolvers.rs
View File

@ -1,3 +1,5 @@
#![cfg(feature = "connect")]
use std::{
io,
net::{Ipv4Addr, SocketAddr},