mirror of
https://github.com/coder/coder.git
synced 2026-06-03 04:58:23 +00:00
a8222e02e5
Fixes two bugs in the release tool.
## 1. RC tags chosen over release tags on release branches
`allSemverTags()` and `mergedSemverTags()` rely on `git tag
--sort=-v:refname` for ordering. Git's version sort treats pre-release
suffixes (e.g. `-rc.0`) as *greater* than the base release version,
which is the opposite of semver where `v2.32.0 > v2.32.0-rc.0`.
When the release branch code iterates the tag list looking for the first
matching `major.minor`, it finds the RC tag first, leading to incorrect
version suggestions (e.g. suggesting `v2.32.0` again instead of
`v2.32.1`).
**Fix:** Re-sort parsed tags using the existing `GreaterThan` method via
a new `sortVersionsDesc` helper.
## 2. Misleading mainline changelog blurb on ESR/older branch patches
When releasing a patch on an older branch (e.g. `release/2.29` for ESR),
the version is neither mainline nor stable. Declining the stable prompt
would always produce the mainline changelog note ("This is a mainline
Coder release..."), which is incorrect.
**Fix:** Only emit the mainline note when the version's minor matches
the current mainline series. For older branches the changelog omits the
note entirely.
> Generated by Coder Agents
138 lines
3.3 KiB
Go
138 lines
3.3 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"regexp"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// version holds a parsed semver version with optional prerelease
|
|
// suffix (e.g. "rc.0").
|
|
type version struct {
|
|
Major int
|
|
Minor int
|
|
Patch int
|
|
Pre string // e.g. "rc.0", "" for stable releases.
|
|
}
|
|
|
|
var semverRe = regexp.MustCompile(`^v(\d+)\.(\d+)\.(\d+)(-(.+))?$`)
|
|
|
|
func parseVersion(s string) (version, bool) {
|
|
m := semverRe.FindStringSubmatch(s)
|
|
if m == nil {
|
|
return version{}, false
|
|
}
|
|
maj, _ := strconv.Atoi(m[1])
|
|
mnr, _ := strconv.Atoi(m[2])
|
|
pat, _ := strconv.Atoi(m[3])
|
|
return version{Major: maj, Minor: mnr, Patch: pat, Pre: m[5]}, true
|
|
}
|
|
|
|
func (v version) String() string {
|
|
if v.Pre != "" {
|
|
return fmt.Sprintf("v%d.%d.%d-%s", v.Major, v.Minor, v.Patch, v.Pre)
|
|
}
|
|
return fmt.Sprintf("v%d.%d.%d", v.Major, v.Minor, v.Patch)
|
|
}
|
|
|
|
// IsRC returns true when the version has a prerelease suffix starting
|
|
// with "rc." (e.g. "rc.0", "rc.1").
|
|
func (v version) IsRC() bool {
|
|
return strings.HasPrefix(v.Pre, "rc.")
|
|
}
|
|
|
|
// rcNumber returns the numeric RC identifier (e.g. 0 for "rc.0").
|
|
// It returns -1 when the version is not an RC.
|
|
func (v version) rcNumber() int {
|
|
if !v.IsRC() {
|
|
return -1
|
|
}
|
|
n, err := strconv.Atoi(strings.TrimPrefix(v.Pre, "rc."))
|
|
if err != nil {
|
|
return -1
|
|
}
|
|
return n
|
|
}
|
|
|
|
func (v version) GreaterThan(b version) bool {
|
|
if v.Major != b.Major {
|
|
return v.Major > b.Major
|
|
}
|
|
if v.Minor != b.Minor {
|
|
return v.Minor > b.Minor
|
|
}
|
|
if v.Patch != b.Patch {
|
|
return v.Patch > b.Patch
|
|
}
|
|
// A release without prerelease suffix is greater than one
|
|
// with a prerelease suffix (v2.32.0 > v2.32.0-rc.0).
|
|
if v.Pre == "" && b.Pre != "" {
|
|
return true
|
|
}
|
|
if v.Pre != "" && b.Pre == "" {
|
|
return false
|
|
}
|
|
// Both have prerelease: compare numerically for RC versions.
|
|
if v.IsRC() && b.IsRC() {
|
|
return v.rcNumber() > b.rcNumber()
|
|
}
|
|
// Fallback for non-RC prerelease strings.
|
|
return v.Pre > b.Pre
|
|
}
|
|
|
|
func (v version) Equal(b version) bool {
|
|
return v.Major == b.Major && v.Minor == b.Minor && v.Patch == b.Patch && v.Pre == b.Pre
|
|
}
|
|
|
|
// sortVersionsDesc sorts a slice of versions in descending order
|
|
// using semver-correct comparison. This is necessary because git's
|
|
// --sort=-v:refname treats pre-release suffixes (e.g. -rc.0) as
|
|
// greater than the release version, which is the opposite of semver
|
|
// where v2.32.0 > v2.32.0-rc.0.
|
|
func sortVersionsDesc(tags []version) {
|
|
sort.Slice(tags, func(i, j int) bool {
|
|
return tags[i].GreaterThan(tags[j])
|
|
})
|
|
}
|
|
|
|
// allSemverTags returns all semver tags sorted descending.
|
|
func allSemverTags() ([]version, error) {
|
|
out, err := gitOutput("tag", "--sort=-v:refname")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if out == "" {
|
|
return nil, nil
|
|
}
|
|
var tags []version
|
|
for _, line := range strings.Split(out, "\n") {
|
|
if v, ok := parseVersion(strings.TrimSpace(line)); ok {
|
|
tags = append(tags, v)
|
|
}
|
|
}
|
|
sortVersionsDesc(tags)
|
|
return tags, nil
|
|
}
|
|
|
|
// mergedSemverTags returns semver tags reachable from HEAD, sorted
|
|
// descending.
|
|
func mergedSemverTags() ([]version, error) {
|
|
out, err := gitOutput("tag", "--merged", "HEAD", "--sort=-v:refname")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if out == "" {
|
|
return nil, nil
|
|
}
|
|
var tags []version
|
|
for _, line := range strings.Split(out, "\n") {
|
|
if v, ok := parseVersion(strings.TrimSpace(line)); ok {
|
|
tags = append(tags, v)
|
|
}
|
|
}
|
|
sortVersionsDesc(tags)
|
|
return tags, nil
|
|
}
|