mirror of
https://github.com/nimbold/Firelink.git
synced 2026-08-12 12:37:04 +00:00
chore(release): refresh build dependencies
Update npm lockfile packages, compatible Rust lockfile entries, and GitHub Actions release workflow actions. Bundle the macOS aria2 OpenSSL legacy provider and set OPENSSL_MODULES for aria2 version checks and daemon startup so packaged builds do not depend on Homebrew OpenSSL provider paths. Keep the Rust Tauri crate family on the previously verified patch line and hold time at 0.3.49 because newer compatible lockfile candidates failed local cargo verification.
This commit is contained in:
@@ -115,6 +115,30 @@ pub fn ytdlp_internal_dir(binary_path: &Path) -> Option<PathBuf> {
|
||||
binary_path.parent().map(|parent| parent.join("_internal"))
|
||||
}
|
||||
|
||||
pub fn apply_aria2_environment(command: &mut std::process::Command, binary_path: &Path) {
|
||||
if let Some(modules_dir) = aria2_openssl_modules_dir(binary_path) {
|
||||
command.env("OPENSSL_MODULES", modules_dir);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn apply_aria2_tokio_environment(command: &mut tokio::process::Command, binary_path: &Path) {
|
||||
if let Some(modules_dir) = aria2_openssl_modules_dir(binary_path) {
|
||||
command.env("OPENSSL_MODULES", modules_dir);
|
||||
}
|
||||
}
|
||||
|
||||
fn aria2_openssl_modules_dir(binary_path: &Path) -> Option<PathBuf> {
|
||||
if !cfg!(target_os = "macos") {
|
||||
return None;
|
||||
}
|
||||
|
||||
let modules_dir = binary_path
|
||||
.parent()?
|
||||
.join("aria2-libs");
|
||||
|
||||
modules_dir.is_dir().then_some(modules_dir)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{development_candidates, packaged_candidates};
|
||||
|
||||
@@ -1868,6 +1868,9 @@ async fn run_sidecar_version(
|
||||
|
||||
let mut command = tokio::process::Command::new(&binary_path);
|
||||
crate::platform::hide_tokio_child_console(&mut command);
|
||||
if sidecar_name == "aria2c" {
|
||||
crate::engines::apply_aria2_tokio_environment(&mut command, &binary_path);
|
||||
}
|
||||
command.args(args).kill_on_drop(true);
|
||||
let output_future = command.output();
|
||||
tokio::pin!(output_future);
|
||||
@@ -4733,6 +4736,7 @@ pub fn run() {
|
||||
for attempt_port in 6800..6900 {
|
||||
let mut cmd = std::process::Command::new(&binary_path);
|
||||
crate::platform::hide_child_console(&mut cmd);
|
||||
crate::engines::apply_aria2_environment(&mut cmd, &binary_path);
|
||||
|
||||
let mut config_file = tempfile::Builder::new().prefix("aria2-").suffix(".conf").tempfile().expect("failed to create aria2 config file");
|
||||
use std::io::Write;
|
||||
|
||||
Reference in New Issue
Block a user