mirror of
https://git.vectorsigma.ru/public/headscale.git
synced 2026-07-28 21:48:00 +00:00
capver: order TailscaleLatestMajorMinor versions with cmpver
Lexical sort placed v1.100 before v1.98; cmpver compares numerically.
This commit is contained in:
@@ -5,10 +5,10 @@ package capver
|
|||||||
import (
|
import (
|
||||||
"maps"
|
"maps"
|
||||||
"slices"
|
"slices"
|
||||||
"sort"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"tailscale.com/tailcfg"
|
"tailscale.com/tailcfg"
|
||||||
|
"tailscale.com/util/cmpver"
|
||||||
"tailscale.com/util/set"
|
"tailscale.com/util/set"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -74,7 +74,9 @@ func TailscaleLatestMajorMinor(n int, stripV bool) []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
majorSl := majors.Slice()
|
majorSl := majors.Slice()
|
||||||
sort.Strings(majorSl)
|
// cmpver orders versions numerically, so v1.100 sorts after v1.98 rather than
|
||||||
|
// lexically before it.
|
||||||
|
slices.SortFunc(majorSl, cmpver.Compare)
|
||||||
|
|
||||||
if n > len(majorSl) {
|
if n > len(majorSl) {
|
||||||
return majorSl
|
return majorSl
|
||||||
|
|||||||
Reference in New Issue
Block a user