@@ -10,17 +10,16 @@ import (
1010 "fmt"
1111 "log"
1212 "os/exec"
13- "sort"
14- "strconv"
13+ "slices"
1514 "strings"
1615
17- "github.com/Masterminds/semver/v3 "
16+ "github.com/cockroachdb/version "
1817)
1918
2019const remoteOrigin = "origin"
2120
22- func findVersions (text string ) []* semver .Version {
23- var versions []* semver .Version
21+ func findVersions (text string ) []version .Version {
22+ var versions []version .Version
2423 for _ , line := range strings .Split (text , "\n " ) {
2524 trimmedLine := strings .TrimSpace (line )
2625 if trimmedLine == "" {
@@ -30,7 +29,7 @@ func findVersions(text string) []*semver.Version {
3029 if strings .Contains (trimmedLine , "-alpha.0000" ) {
3130 continue
3231 }
33- version , err := semver . NewVersion (trimmedLine )
32+ version , err := version . Parse (trimmedLine )
3433 if err != nil {
3534 fmt .Printf ("WARNING: cannot parse version '%s'\n " , trimmedLine )
3635 continue
@@ -59,52 +58,36 @@ func findPreviousRelease(releaseSeries string, ignorePrereleases bool) (string,
5958 return "" , fmt .Errorf ("zero versions found" )
6059 }
6160 if ignorePrereleases {
62- var filteredVersions []* semver .Version
61+ var filteredVersions []version .Version
6362 for _ , v := range versions {
64- if v . Prerelease () == "" {
63+ if ! v . IsPrerelease () {
6564 filteredVersions = append (filteredVersions , v )
6665 }
6766 }
6867 versions = filteredVersions
6968 }
70- sort .Sort (semver .Collection (versions ))
71- return versions [len (versions )- 1 ].Original (), nil
69+ slices .SortFunc (versions , func (a , b version.Version ) int {
70+ return a .Compare (b )
71+ })
72+ return versions [len (versions )- 1 ].String (), nil
7273}
7374
7475// bumpVersion increases the patch release version (the last digit) of a given version.
7576// For pre-release versions, the pre-release part is bumped.
76- func bumpVersion (version string ) (string , error ) {
77+ func bumpVersion (versionStr string ) (version. Version , error ) {
7778 // special case for versions like v23.2.0-alpha.00000000
78- if strings .HasSuffix (version , "-alpha.00000000" ) {
79+ if strings .HasSuffix (versionStr , "-alpha.00000000" ) {
7980 // reset the version to something we can parse and bump
80- version = strings .TrimSuffix (version , ".00000000" ) + ".0"
81+ versionStr = strings .TrimSuffix (versionStr , ".00000000" ) + ".0"
8182 }
82- semanticVersion , err := semver . NewVersion ( version )
83+ ver , err := version . Parse ( versionStr )
8384 if err != nil {
84- return "" , fmt .Errorf ("cannot parse version: %w" , err )
85- }
86- var nextVersion semver.Version
87- if semanticVersion .Prerelease () == "" {
88- // For regular releases we can use IncPatch without any modification
89- nextVersion = semanticVersion .IncPatch ()
90- } else {
91- // For pre-releases (alpha, beta, rc), we need to implement our own bumper. It takes the last digit and increments it.
92- pre := semanticVersion .Prerelease ()
93- preType , digit , found := strings .Cut (pre , "." )
94- if ! found {
95- return "" , fmt .Errorf ("parsing prerelease %s" , semanticVersion .Original ())
96- }
97- preVersion , err := strconv .Atoi (digit )
98- if err != nil {
99- return "" , fmt .Errorf ("atoi prerelease error %s: %w" , semanticVersion .Original (), err )
100- }
101- preVersion ++
102- nextVersion , err = semanticVersion .SetPrerelease (fmt .Sprintf ("%s.%d" , preType , preVersion ))
103- if err != nil {
104- return "" , fmt .Errorf ("bumping prerelease %s: %w" , semanticVersion .Original (), err )
105- }
85+ return version.Version {}, fmt .Errorf ("cannot parse version: %w" , err )
86+ }
87+ if ver .IsPrerelease () {
88+ return ver .IncPreRelease ()
10689 }
107- return nextVersion . Original (), nil
90+ return ver . IncPatch ()
10891}
10992
11093// listRemoteBranches retrieves a list of remote branches using a pattern, assuming the remote name is `origin`.
0 commit comments