pull/1991/head
jLynx 8 months ago
parent 44d2e778ad
commit 6b21e88669

@ -53,8 +53,7 @@ fn build_app(cwd: &Path, config: &Config, bundle_updater: bool, target: BundleTa
.arg(serde_json::to_string(config).unwrap()) .arg(serde_json::to_string(config).unwrap())
.env("TAURI_SIGNING_PRIVATE_KEY", UPDATER_PRIVATE_KEY) .env("TAURI_SIGNING_PRIVATE_KEY", UPDATER_PRIVATE_KEY)
.env("TAURI_SIGNING_PRIVATE_KEY_PASSWORD", "") .env("TAURI_SIGNING_PRIVATE_KEY_PASSWORD", "")
.current_dir(cwd) .current_dir(cwd);
.stdout(std::process::Stdio::null());
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
command.args(["--bundles", target.name()]); command.args(["--bundles", target.name()]);
@ -117,15 +116,15 @@ fn bundle_paths(root_dir: &Path, version: &str) -> Vec<(BundleTarget, PathBuf)>
// Return both AppImage and Deb paths // Return both AppImage and Deb paths
vec![ vec![
( (
BundleTarget::Deb, BundleTarget::AppImage,
root_dir.join(format!( root_dir.join(format!(
"target/debug/bundle/deb/app-updater_{version}_amd64.deb" "target/debug/bundle/appimage/app-updater_{version}_amd64.AppImage"
)), )),
), ),
( (
BundleTarget::AppImage, BundleTarget::Deb,
root_dir.join(format!( root_dir.join(format!(
"target/debug/bundle/appimage/app-updater_{version}_amd64.AppImage" "target/debug/bundle/deb/app-updater_{version}_amd64.deb"
)), )),
), ),
] ]
@ -211,7 +210,7 @@ fn update_app() {
); );
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let bundle_targets = vec![BundleTarget::Deb, BundleTarget::AppImage]; let bundle_targets = vec![BundleTarget::AppImage, BundleTarget::Deb];
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
let bundle_targets = vec![BundleTarget::default()]; let bundle_targets = vec![BundleTarget::default()];

Loading…
Cancel
Save