Skip to content

Commit

Permalink
ci: switch to using openssl-sys
Browse files Browse the repository at this point in the history
  • Loading branch information
IgnisDa committed Jul 31, 2024
1 parent 66dff65 commit acf29b2
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 37 deletions.
48 changes: 27 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sea-orm = { version = "=1.0.0-rc.5", features = [
"debug-print",
"postgres-array",
"macros",
"runtime-tokio-rustls",
"runtime-tokio-native-tls",
"sqlx-postgres",
"with-chrono",
"with-json",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN moon run frontend:build transactional:build
RUN moon docker prune

FROM --platform=$BUILDPLATFORM lukemathwalker/cargo-chef AS backend-chef
RUN apt-get update && apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross clang llvm ca-certificates
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
RUN update-ca-certificates
WORKDIR app

Expand Down
7 changes: 1 addition & 6 deletions apps/backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ isolang = { version = "=2.4.0", features = ["list_languages"] }
itertools = "=0.13.0"
jsonwebtoken = { version = "=9.3.0", default-features = false }
kinded = "=0.3.0"
lettre = { version = "=0.11.7", features = [
"rustls-tls",
"smtp-transport",
"builder",
], default-features = false }
lettre = "=0.11.7"
markdown = "=1.0.0-alpha.18"
mime_guess = "=2.0.5"
nanoid = { workspace = true }
Expand All @@ -60,7 +56,6 @@ regex = "=1.10.5"
# FIXME: Upgrade once https://github.com/seanmonstar/reqwest/pull/1620 is merged
reqwest = { git = "https://github.com/thomasqueirozb/reqwest", branch = "base_url", features = [
"json",
"rustls-tls",
"stream",
], default-features = false }
rs-utils = { path = "../../libs/rs-utils" }
Expand Down
3 changes: 1 addition & 2 deletions apps/backend/src/notification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,8 @@ impl NotificationPlatformSpecifics {
config.server.smtp.password.to_owned(),
);

let mailer = SmtpTransport::starttls_relay(&config.server.smtp.server)
let mailer = SmtpTransport::relay(&config.server.smtp.server)
.unwrap()
.port(config.server.smtp.port)
.credentials(credentials)
.build();

Expand Down
3 changes: 0 additions & 3 deletions docs/includes/backend-config-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,6 @@ server:
# @envvar SERVER_SMTP_PASSWORD
password: ""

# @envvar SERVER_SMTP_PORT
port: 587

# @envvar SERVER_SMTP_SERVER
server: ""

Expand Down
2 changes: 0 additions & 2 deletions libs/config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@ pub struct SchedulerConfig {
#[config(rename_all = "snake_case", env_prefix = "SERVER_SMTP_")]
pub struct SmtpConfig {
pub server: String,
#[setting(default = 587)]
pub port: u16,
pub user: String,
pub password: String,
#[setting(default = "Ryot <[email protected]>")]
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
profile = "default"
channel = "1.77.2"
channel = "1.80.0"

0 comments on commit acf29b2

Please sign in to comment.