Skip to content

Commit acf29b2

Browse files
committed
ci: switch to using openssl-sys
1 parent 66dff65 commit acf29b2

File tree

8 files changed

+32
-37
lines changed

8 files changed

+32
-37
lines changed

Cargo.lock

+27-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ sea-orm = { version = "=1.0.0-rc.5", features = [
2929
"debug-print",
3030
"postgres-array",
3131
"macros",
32-
"runtime-tokio-rustls",
32+
"runtime-tokio-native-tls",
3333
"sqlx-postgres",
3434
"with-chrono",
3535
"with-json",

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN moon run frontend:build transactional:build
2222
RUN moon docker prune
2323

2424
FROM --platform=$BUILDPLATFORM lukemathwalker/cargo-chef AS backend-chef
25-
RUN apt-get update && apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross clang llvm ca-certificates
25+
RUN apt-get update && apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross clang llvm ca-certificates pkg-config make g++ libssl-dev
2626
RUN update-ca-certificates
2727
WORKDIR app
2828

apps/backend/Cargo.toml

+1-6
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ isolang = { version = "=2.4.0", features = ["list_languages"] }
4444
itertools = "=0.13.0"
4545
jsonwebtoken = { version = "=9.3.0", default-features = false }
4646
kinded = "=0.3.0"
47-
lettre = { version = "=0.11.7", features = [
48-
"rustls-tls",
49-
"smtp-transport",
50-
"builder",
51-
], default-features = false }
47+
lettre = "=0.11.7"
5248
markdown = "=1.0.0-alpha.18"
5349
mime_guess = "=2.0.5"
5450
nanoid = { workspace = true }
@@ -60,7 +56,6 @@ regex = "=1.10.5"
6056
# FIXME: Upgrade once https://github.com/seanmonstar/reqwest/pull/1620 is merged
6157
reqwest = { git = "https://github.com/thomasqueirozb/reqwest", branch = "base_url", features = [
6258
"json",
63-
"rustls-tls",
6459
"stream",
6560
], default-features = false }
6661
rs-utils = { path = "../../libs/rs-utils" }

apps/backend/src/notification.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,8 @@ impl NotificationPlatformSpecifics {
163163
config.server.smtp.password.to_owned(),
164164
);
165165

166-
let mailer = SmtpTransport::starttls_relay(&config.server.smtp.server)
166+
let mailer = SmtpTransport::relay(&config.server.smtp.server)
167167
.unwrap()
168-
.port(config.server.smtp.port)
169168
.credentials(credentials)
170169
.build();
171170

docs/includes/backend-config-schema.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,6 @@ server:
206206
# @envvar SERVER_SMTP_PASSWORD
207207
password: ""
208208

209-
# @envvar SERVER_SMTP_PORT
210-
port: 587
211-
212209
# @envvar SERVER_SMTP_SERVER
213210
server: ""
214211

libs/config/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,6 @@ pub struct SchedulerConfig {
338338
#[config(rename_all = "snake_case", env_prefix = "SERVER_SMTP_")]
339339
pub struct SmtpConfig {
340340
pub server: String,
341-
#[setting(default = 587)]
342-
pub port: u16,
343341
pub user: String,
344342
pub password: String,
345343
#[setting(default = "Ryot <no-reply@mailer.io>")]

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
22
profile = "default"
3-
channel = "1.77.2"
3+
channel = "1.80.0"

0 commit comments

Comments
 (0)