Skip to content

Commit

Permalink
Merge pull request #237 from axodotdev/fix-runtest-helper
Browse files Browse the repository at this point in the history
fix: fix runtest helper
  • Loading branch information
mistydemeo authored Dec 19, 2024
2 parents 55460ff + 959a8ae commit 03783f1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion axoupdater-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions axoupdater/src/test/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"}"#;

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 03783f1

Please sign in to comment.