Unverified Commit 837565b9 authored by AWS SDK Rust Bot's avatar AWS SDK Rust Bot Committed by GitHub
Browse files

Merge smithy-rs-release-1.x.y back into main (#3377)

parents a8760844 366ccab1
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -43,10 +43,11 @@ fn ancestor_tag(repo: &Repo) -> Result<ReleaseTag> {
    let tag = repo
        .git(["describe", "--tags"])
        .expect_success_output("find the current ancestor release tag")?;
    let maybe_release_tag = ReleaseTag::from_str(&tag);
    let tag = tag.trim();
    let maybe_release_tag = ReleaseTag::from_str(tag);
    let release_tag = match maybe_release_tag {
        Ok(tag) => Some(tag),
        Err(_) => strip_describe_tags_suffix(&tag)
        Err(_) => strip_describe_tags_suffix(tag)
            .map(ReleaseTag::from_str)
            .transpose()
            .context("failed to find ancestor release tag")?,