Skip to content

Commit 598bd66

Browse files
committed
chore: remove openssl-sys
1 parent f7d24ad commit 598bd66

6 files changed

Lines changed: 91 additions & 27 deletions

File tree

.github/workflows/release-rust.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ jobs:
6767
working-directory: memoria
6868
env:
6969
SQLX_OFFLINE: "true"
70-
# Cross image has libssl-dev 1.0.2 (Xenial); openssl-sys requires 1.1+ or 3.x. Force vendored.
71-
OPENSSL_NO_PKG_CONFIG: "1"
7270
run: cross build --release -p memoria-cli --target ${{ matrix.target }}
7371

7472
- name: Build (native)

memoria/Cargo.lock

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

memoria/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rust-version = "1.85"
1919
tokio = { version = "1.40", features = ["full"] }
2020
axum = { version = "0.7", features = ["macros"] }
2121
futures = "0.3"
22-
sqlx = { version = "0.8", features = ["runtime-tokio", "mysql", "chrono", "json", "macros"] }
22+
sqlx = { version = "0.8", features = ["runtime-tokio", "tls-rustls", "mysql", "chrono", "json", "macros"] }
2323
serde = { version = "1.0", features = ["derive"] }
2424
serde_json = "1.0"
2525
chrono = { version = "0.4", features = ["serde"] }
@@ -28,7 +28,7 @@ anyhow = "1.0"
2828
tracing = "0.1"
2929
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
3030
clap = { version = "4.5", features = ["derive", "env"] }
31-
reqwest = { version = "0.12", features = ["json"] }
31+
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
3232
uuid = { version = "1.0", features = ["v4"] }
3333
async-trait = "0.1"
3434
tower = "0.4"

memoria/Cross.toml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
[target.aarch64-unknown-linux-gnu]
2-
# Vendored OpenSSL needs a C compiler, perl, and make (perl/make already in cross image).
3-
# Do NOT install system libssl-dev — the cross image (Xenial) has 1.0.2 which is
4-
# incompatible with openssl-sys. We use openssl = { features = ["vendored"] } instead.
2+
# No special setup needed — we use rustls (pure Rust TLS), no system OpenSSL required.
53

64
[build.env]
7-
# Pass these into the cross Docker container so vendored OpenSSL build works:
8-
# - OPENSSL_NO_PKG_CONFIG: skip system libssl, force build from source
9-
# - SQLX_OFFLINE: don't require a live database for compile-time query checks
10-
passthrough = ["OPENSSL_NO_PKG_CONFIG", "SQLX_OFFLINE"]
5+
passthrough = ["SQLX_OFFLINE"]

memoria/crates/memoria-cli/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,4 @@ tracing = { workspace = true }
2929
tracing-subscriber = { workspace = true }
3030
tower-http = { workspace = true }
3131
sqlx = { workspace = true }
32-
reqwest = { version = "0.12", features = ["json", "blocking"] }
33-
# Vendored OpenSSL for cross-compilation (aarch64-linux has no system OpenSSL in CI)
34-
openssl = { version = "0.10", features = ["vendored"] }
32+
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }

memoria/crates/memoria-service/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ uuid = { workspace = true }
1515
async-trait = { workspace = true }
1616
tracing = { workspace = true }
1717
tokio = { workspace = true }
18-
sqlx = { workspace = true, features = ["mysql", "runtime-tokio-native-tls"] }
18+
sqlx = { workspace = true, features = ["mysql", "runtime-tokio-rustls"] }
1919
memoria-git = { path = "../memoria-git" }
2020

2121
[dev-dependencies]

0 commit comments

Comments
 (0)