Skip to content

Commit dce64fd

Browse files
committed
fix: use rustls instead of native-tls for tokio-tungstenite
native-tls pulls openssl-sys which breaks cross-compilation for arm64. rustls is already in the dependency tree via reqwest.
1 parent cca15d5 commit dce64fd

3 files changed

Lines changed: 12 additions & 103 deletions

File tree

Cargo.lock

Lines changed: 7 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ tracing-opentelemetry = { version = "0.32", optional = true }
5454
opentelemetry-appender-tracing = { version = "0.31", features = ["experimental_use_tracing_span_context"], optional = true }
5555
sqlx = { version = "0.8.6", features = [ "runtime-tokio", "postgres", "uuid", "bigdecimal", "rust_decimal", "tls-rustls" ] }
5656
reqwest = { version = "0.13.1", default-features = false, features = ["rustls", "json", "stream"] }
57-
tokio-tungstenite = { version = "0.26", features = ["native-tls"] }
57+
tokio-tungstenite = { version = "0.26", features = ["rustls-tls-webpki-roots"] }
58+
rustls = { version = "0.23", features = ["ring"] }
5859

5960
# Core types
6061
openworkers-core = { git = "https://github.com/openworkers/openworkers-core", tag = "v0.14.0", features = ["hyper"] }

src/ops.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,9 @@ impl OperationsHandler for RunnerOperations {
683683
use tokio_tungstenite::tungstenite;
684684
use tungstenite::client::IntoClientRequest;
685685

686+
// Ensure rustls CryptoProvider is installed (no-op if already set)
687+
let _ = rustls::crypto::ring::default_provider().install_default();
688+
686689
// Parse URL, converting http(s) to ws(s) if needed
687690
let ws_url = if url.starts_with("http://") {
688691
url.replacen("http://", "ws://", 1)

0 commit comments

Comments
 (0)