From c801594b85a4bbb961e63ec294e94a3158d7d01c Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Thu, 3 Oct 2024 22:12:02 -0400 Subject: [PATCH] build(xtask): only consider major and minor versions when validating the current version --- xtask/src/bump.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xtask/src/bump.rs b/xtask/src/bump.rs index bd357afc..c581a76c 100644 --- a/xtask/src/bump.rs +++ b/xtask/src/bump.rs @@ -29,11 +29,14 @@ pub fn get_latest_tag(repo: &Repository) -> Result Result<(), Box> { let repo = Repository::open(".")?; let latest_tag = get_latest_tag(&repo)?; + let current_version = Version::parse(&latest_tag)?; let latest_tag_sha = repo.revparse_single(&format!("v{latest_tag}"))?.id(); - let workspace_toml_version = fetch_workspace_version()?; + let workspace_toml_version = Version::parse(&fetch_workspace_version()?)?; - if latest_tag != workspace_toml_version { + if current_version.major != workspace_toml_version.major + && current_version.minor != workspace_toml_version.minor + { eprintln!( indoc! {" Seems like the workspace Cargo.toml ({}) version does not match up with the latest git tag ({}). @@ -48,7 +51,6 @@ pub fn bump_versions() -> Result<(), Box> { revwalk.push_range(format!("{latest_tag_sha}..HEAD").as_str())?; let mut diff_options = DiffOptions::new(); - let current_version = Version::parse(&latest_tag)?; let mut should_increment_patch = false; let mut should_increment_minor = false;