shifathosn
/
craft-launcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release 0.3.0; rustfmt platform.rs and install.rs (#160) 

Bumps the workspace version to 0.3.0 for the new features since 0.2.1, and
applies cargo fmt to the two files from #149 that failed CI's format check.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Brandon Thomas 2026-10-11 15:49:47 -04:00 committed by GitHub
parent c273a94a9a
commit 41369d3416
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -276,7 +276,7 @@ checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
[[package]] [[package]]
name = "artcraft-launcher" name = "artcraft-launcher"
version = "0.2.1" version = "0.3.0"
dependencies = [ dependencies = [
"artcraft-launcher-core", "artcraft-launcher-core",
"artcraft-launcher-native", "artcraft-launcher-native",
@ -298,7 +298,7 @@ dependencies = [
[[package]] [[package]]
name = "artcraft-launcher-core" name = "artcraft-launcher-core"
version = "0.2.1" version = "0.3.0"
dependencies = [ dependencies = [
"semver", "semver",
"serde", "serde",
@ -307,7 +307,7 @@ dependencies = [
[[package]] [[package]]
name = "artcraft-launcher-native" name = "artcraft-launcher-native"
version = "0.2.1" version = "0.3.0"
dependencies = [ dependencies = [
"artcraft-launcher-core", "artcraft-launcher-core",
"dirs 6.0.0", "dirs 6.0.0",
@ -325,7 +325,7 @@ dependencies = [
[[package]] [[package]]
name = "artcraft-launcher-ui-egui" name = "artcraft-launcher-ui-egui"
version = "0.2.1" version = "0.3.0"
dependencies = [ dependencies = [
"artcraft-launcher-core", "artcraft-launcher-core",
"egui", "egui",
@ -341,7 +341,7 @@ dependencies = [
[[package]] [[package]]
name = "artcraft-launcher-web" name = "artcraft-launcher-web"
version = "0.2.1" version = "0.3.0"
dependencies = [ dependencies = [
"artcraft-launcher-core", "artcraft-launcher-core",
"artcraft-launcher-ui-egui", "artcraft-launcher-ui-egui",
@ -5799,7 +5799,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
[[package]] [[package]]
name = "xtask" name = "xtask"
version = "0.2.1" version = "0.3.0"
[[package]] [[package]]
name = "yoke" name = "yoke"

2
Cargo.toml
View File

@ -3,7 +3,7 @@ resolver = "3"
members = ["crates/*", "apps/*", "xtask"] members = ["crates/*", "apps/*", "xtask"]
[workspace.package] [workspace.package]
version = "0.2.1" version = "0.3.0"
edition = "2024" edition = "2024"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
rust-version = "1.90" rust-version = "1.90"

16
crates/core/src/platform.rs
View File

@ -321,16 +321,10 @@ mod tests {
for kind in [PackageKind::AppImage, PackageKind::Deb, PackageKind::Rpm, PackageKind::Flatpak, PackageKind::TarGz] { for kind in [PackageKind::AppImage, PackageKind::Deb, PackageKind::Rpm, PackageKind::Flatpak, PackageKind::TarGz] {
let pick_x64 = pick_asset(&multi_arch_release, &["photocraft"], p_x64, &[kind]).map(|(a, _)| a.name.clone()); let pick_x64 = pick_asset(&multi_arch_release, &["photocraft"], p_x64, &[kind]).map(|(a, _)| a.name.clone());
assert!( assert!(pick_x64.as_deref().unwrap().contains("linux-x86_64"), "Expected x86_64 asset for {kind:?}, got {pick_x64:?}");
pick_x64.as_deref().unwrap().contains("linux-x86_64"),
"Expected x86_64 asset for {kind:?}, got {pick_x64:?}"
);
let pick_arm64 = pick_asset(&multi_arch_release, &["photocraft"], p_arm64, &[kind]).map(|(a, _)| a.name.clone()); let pick_arm64 = pick_asset(&multi_arch_release, &["photocraft"], p_arm64, &[kind]).map(|(a, _)| a.name.clone());
assert!( assert!(pick_arm64.as_deref().unwrap().contains("linux-aarch64"), "Expected aarch64 asset for {kind:?}, got {pick_arm64:?}");
pick_arm64.as_deref().unwrap().contains("linux-aarch64"),
"Expected aarch64 asset for {kind:?}, got {pick_arm64:?}"
);
} }
// On x86_64 Linux, an aarch64-only asset must NEVER match or fall back // On x86_64 Linux, an aarch64-only asset must NEVER match or fall back
@ -342,11 +336,7 @@ mod tests {
"photocraft-0.5.0-linux-aarch64.tar.gz", "photocraft-0.5.0-linux-aarch64.tar.gz",
]); ]);
for kind in [PackageKind::AppImage, PackageKind::Deb, PackageKind::Rpm, PackageKind::Flatpak, PackageKind::TarGz] { for kind in [PackageKind::AppImage, PackageKind::Deb, PackageKind::Rpm, PackageKind::Flatpak, PackageKind::TarGz] {
assert_eq!( assert_eq!(pick_asset(&arm_only_release, &["photocraft"], p_x64, &[kind]), None, "x86_64 must never match an aarch64 asset for {kind:?}");
pick_asset(&arm_only_release, &["photocraft"], p_x64, &[kind]),
None,
"x86_64 must never match an aarch64 asset for {kind:?}"
);
} }
} }
} }

6
crates/native/src/install.rs
View File

@ -509,11 +509,7 @@ pub(crate) mod linux {
} else { } else {
let stderr = String::from_utf8_lossy(&output.stderr); let stderr = String::from_utf8_lossy(&output.stderr);
let err = stderr.trim(); let err = stderr.trim();
let err = if err.is_empty() { let err = if err.is_empty() { String::from_utf8_lossy(&output.stdout).trim().to_string() } else { err.to_string() };
String::from_utf8_lossy(&output.stdout).trim().to_string()
} else {
err.to_string()
};
if err.is_empty() { if err.is_empty() {
Err("Flatpak couldn't install the bundle (it needs the Flathub remote for its runtime)".into()) Err("Flatpak couldn't install the bundle (it needs the Flathub remote for its runtime)".into())
} else { } else {