ci: switch to using openssl-sys

Also remove architecture stuff in build process.

Author: IgnisDa

Cargo.lock

@@ -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",

Cargo.toml

@@ -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
 
@@ -32,7 +32,6 @@ RUN cargo chef prepare --recipe-path recipe.json
 
 FROM backend-chef AS backend-builder
 # build specific
-ARG TARGETARCH
 ARG BUILD_PROFILE=release
 # application specific
 ARG APP_VERSION
@@ -41,15 +40,8 @@ ARG DEFAULT_MAL_CLIENT_ID
 RUN test -n "$APP_VERSION" && \
     test -n "$DEFAULT_TMDB_ACCESS_TOKEN" && \
     test -n "$DEFAULT_MAL_CLIENT_ID"
-ENV RUST_TARGET_TRIPLE_arm64="aarch64-unknown-linux-gnu"
-ENV RUST_TARGET_TRIPLE_amd64="x86_64-unknown-linux-gnu"
-ENV TARGET_CC="clang"
-ENV TARGET_AR="llvm-ar"
-ENV CFLAGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu"
-ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
 COPY --from=backend-planner /app/recipe.json recipe.json
-RUN rustup target add $(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH")
-RUN cargo chef cook --profile $BUILD_PROFILE --target $(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH") --recipe-path recipe.json
+RUN cargo chef cook --profile $BUILD_PROFILE --recipe-path recipe.json
 COPY . .
 COPY --from=frontend-builder /app/apps/backend/templates ./apps/backend/templates
 RUN APP_VERSION=$APP_VERSION \

Dockerfile

@@ -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 }
@@ -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" }

apps/backend/Cargo.toml

@@ -2,8 +2,5 @@
 
 set -euxo pipefail
 
-export RUST_TARGET_TRIPLE=$(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH")
-
-rustup target add $RUST_TARGET_TRIPLE
-cargo build --profile ${BUILD_PROFILE} --bin ryot --target ${RUST_TARGET_TRIPLE}
-cp -R /app/target/${RUST_TARGET_TRIPLE}/${BUILD_PROFILE}/ryot /app/ryot
+cargo build --profile ${BUILD_PROFILE} --bin ryot
+cp -R /app/target/${BUILD_PROFILE}/ryot /app/ryot

apps/backend/ci/build-app.sh

@@ -1,5 +1,6 @@
 use std::{
     collections::{HashMap, HashSet},
+    fmt,
     fs::File,
     future::Future,
     iter::zip,
@@ -583,9 +584,9 @@ struct ProgressUpdateCache {
     manga_chapter_number: Option<i32>,
 }
 
-impl ToString for ProgressUpdateCache {
-    fn to_string(&self) -> String {
-        format!("{:#?}", self)
+impl fmt::Display for ProgressUpdateCache {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:#?}", self)
     }
 }
 

apps/backend/src/miscellaneous.rs

@@ -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();
 

apps/backend/src/notification.rs

@@ -74,7 +74,6 @@ pub struct AppServices {
     pub media_service: Arc<MiscellaneousService>,
     pub importer_service: Arc<ImporterService>,
     pub exporter_service: Arc<ExporterService>,
-    pub file_storage_service: Arc<FileStorageService>,
     pub exercise_service: Arc<ExerciseService>,
 }
 
@@ -159,7 +158,6 @@ pub async fn create_app_services(
         media_service,
         importer_service,
         exporter_service,
-        file_storage_service,
         exercise_service,
     }
 }

apps/backend/src/utils.rs

@@ -206,9 +206,6 @@ server:
     # @envvar SERVER_SMTP_PASSWORD
     password: ""
 
-    # @envvar SERVER_SMTP_PORT
-    port: 587
-
     # @envvar SERVER_SMTP_SERVER
     server: ""
 

docs/includes/backend-config-schema.yaml

@@ -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 <no-reply@mailer.io>")]

libs/config/src/lib.rs

@@ -1,3 +1,3 @@
 [toolchain]
 profile = "default"
-channel = "1.77.2"
+channel = "1.80.0"