Skip to content

fix(tools): respect manual major version bumps in go.mod #1217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Iam-Karan-Suresh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tools): respect manual major version bumps in go.mod #1217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion cmd/internal/module_bump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,22 @@ func (m *ModuleBump) apply(ctx context.Context, targetModule string, dryRun bool
return false, fmt.Errorf("failed to read %s: %w", gomod, err)
}
oldContent := string(b)
if !m.regex.MatchString(oldContent) {
// Extract current version from the go.mod line and compare with the computed new version.
matches := m.regex.FindStringSubmatch(oldContent)
if len(matches) == 0 {
return false, nil
}
if len(matches) > 1 {
Copy link
Copy Markdown
Member

@matheuscscp matheuscscp May 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can len(matches) == 1?

if currentVer, err := semver.NewVersion(matches[1]); err == nil {
if newVer, err := semver.NewVersion(m.newVersion); err == nil {
if currentVer.GreaterThan(newVer) {
// Use the higher version already present (e.g., a manual major bump).
m.newVersion = currentVer.String()
}
}
}
}

bumpString := fmt.Sprintf("github.com/fluxcd/pkg/%s v%s", m.module, m.newVersion)
newContent := m.regex.ReplaceAllString(oldContent, bumpString)
if oldContent == newContent {
Expand Down
Loading