Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions rust/boil/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ impl VersionExt for semver::Version {
if self.is_floating() {
self.to_string()
} else {
format!(
"{major}.{minor}-{pre}",
major = self.major,
minor = self.minor,
pre = self.pre
)
let mut version = format!("{major}.{minor}", major = self.major, minor = self.minor,);
if !self.pre.is_empty() {
version.push('-');
version.push_str(&self.pre);
}

version
}
}
}
Expand Down Expand Up @@ -168,4 +169,22 @@ mod tests {
semver::Version::from_str(input).expect("input must be valid semantic version");
assert!(!version.is_floating());
}

#[rstest]
Comment thread
Techassi marked this conversation as resolved.
// Already considered floating, returned unchanged
#[case("0.0.0-pr1234-extra-tag-data1234-amd64", None)]
#[case("0.0.0-pr1234-extra-tag-data1234", None)]
#[case("0.0.0-dev-extra-tag-data1234", None)]
#[case("0.0.0-pr1234", None)]
#[case("0.0.0-dev", None)]
// Not floating, so the expected tag is different from the input
#[case("1.2.3-pr321", Some("1.2-pr321"))]
#[case("1.2.3-rc.1", Some("1.2-rc.1"))]
#[case("1.2.3", Some("1.2"))]
fn floating_tag(#[case] input: &str, #[case] expected: Option<&str>) {
let floating_version = semver::Version::from_str(input)
.expect("input must be valid semantic version")
.floating();
assert_eq!(floating_version, expected.unwrap_or(input));
}
}