Skip to content

Commit 8e98934

Browse files
committed
Fix tagger catching v3 tags
1 parent c799e8f commit 8e98934

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

tools/cmd/tag.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func NewTagCmd(v *viper.Viper) (*cobra.Command, error) {
3434
}
3535
requestedVersion, previousVersion, err := tagger.Tag()
3636
if requestedVersion != nil && previousVersion != nil {
37-
fmt.Fprintf(os.Stdout, "%s,%s", requestedVersion.String(), previousVersion.String())
37+
fmt.Fprintf(os.Stdout, "v%s,v%s", requestedVersion.String(), previousVersion.String())
3838
}
3939
if err != nil {
4040
if errors.Is(ErrNoNewVersion, err) {
@@ -117,6 +117,11 @@ func (t *Tagger) largestTagSemver(repo *git.Repository, major uint64) (*semver.V
117117
} else {
118118
versionString = tag.Name
119119
}
120+
versionParts := strings.Split(versionString, ".")
121+
if len(versionParts) < 3 {
122+
// This is not a full version tag, so ignore it
123+
return nil
124+
}
120125

121126
version, err := semver.NewVersion(versionString)
122127
if err != nil {
@@ -167,19 +172,15 @@ func (t *Tagger) Tag() (requestedVersion *semver.Version, previousVersion *semve
167172
if err != nil {
168173
return requestedVersion, previousVersion, err
169174
}
170-
taggedVersion, err := semver.NewVersion(previousVersion.String())
171-
if err != nil {
172-
return requestedVersion, previousVersion, errors.New(err)
173-
}
174175
logger := logger.With().
175-
Stringer("tagged-version", taggedVersion).Logger()
176+
Stringer("previous-version", previousVersion).Logger()
176177

177178
logger.Info().Msg("found largest semver tag")
178179

179180
logger = logger.With().
180181
Stringer("requested-version", requestedVersion).
181182
Logger()
182-
if !requestedVersion.GreaterThan(taggedVersion) {
183+
if !requestedVersion.GreaterThan(previousVersion) {
183184
logger.Info().
184185
Msg("VERSION is not greater than latest git tag, nothing to do.")
185186
return requestedVersion, previousVersion, ErrNoNewVersion

0 commit comments

Comments
 (0)