From 23ecd9277a71c7b73f356685187a542cacec4d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Misty=20De=20M=C3=A9o?= Date: Thu, 19 Dec 2024 15:02:51 -0800 Subject: [PATCH 1/2] fix: fix runtest helper The receipt path refactors introduced a chicken-and-egg problem we need to resolve here. --- axoupdater/src/test/helpers.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/axoupdater/src/test/helpers.rs b/axoupdater/src/test/helpers.rs index b57432a..3464832 100644 --- a/axoupdater/src/test/helpers.rs +++ b/axoupdater/src/test/helpers.rs @@ -3,7 +3,7 @@ use std::{ process::{Command, Stdio}, }; -use crate::{receipt::get_receipt_path, ReleaseSourceType}; +use crate::{receipt::get_config_paths, ReleaseSourceType}; static RECEIPT_TEMPLATE: &str = r#"{"binaries":[BINARIES],"install_prefix":"INSTALL_PREFIX","provider":{"source":"cargo-dist","version":"0.10.0-prerelease.1"},"source":{"app_name":"APP_NAME","name":"PACKAGE","owner":"OWNER","release_type":"RELEASE_TYPE"},"version":"VERSION"}"#; @@ -104,9 +104,12 @@ pub fn perform_runtest(runtest_args: &RuntestArgs) -> PathBuf { let app_home = &home.join(".cargo").join("bin"); let app_path = &app_home.join(basename); - let config_path = get_receipt_path(app_name) - .unwrap() + let config_path = get_config_paths(app_name) .unwrap() + // Accept whichever path comes first; it doesn't matter to us. + .first() + .expect("no possible legal config paths found!?") + .to_owned() .into_std_path_buf(); // Ensure we delete any previous copy that may exist From 959a8aefce2baec4e7ea9bdaa52ba7e90840019a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Misty=20De=20M=C3=A9o?= Date: Thu, 19 Dec 2024 15:08:30 -0800 Subject: [PATCH 2/2] release: prep 0.9.0 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- axoupdater-cli/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09c3440..a4e9079 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -362,7 +362,7 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.8.2" +version = "0.9.0" dependencies = [ "axoasset", "axoprocess", @@ -383,7 +383,7 @@ dependencies = [ [[package]] name = "axoupdater-cli" -version = "0.8.2" +version = "0.9.0" dependencies = [ "axoasset", "axocli", diff --git a/Cargo.toml b/Cargo.toml index b863b27..b839ae8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["axoupdater", "axoupdater-cli"] resolver = "2" [workspace.package] -version = "0.8.2" +version = "0.9.0" edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/axodotdev/axoupdater" diff --git a/axoupdater-cli/Cargo.toml b/axoupdater-cli/Cargo.toml index 58984eb..2451736 100644 --- a/axoupdater-cli/Cargo.toml +++ b/axoupdater-cli/Cargo.toml @@ -14,7 +14,7 @@ tls_native_roots = ["axoupdater/tls_native_roots"] [dependencies] axocli = "0.2.0" -axoupdater = { version = "=0.8.2", path = "../axoupdater", features = ["blocking"] } +axoupdater = { version = "=0.9.0", path = "../axoupdater", features = ["blocking"] } clap = { version = "4.5.23", features = ["derive"] } # errors