Merge pull request #296 from Konboi/multiple-major-version

Add fixedMajorVersion option for multiple major version support

Author: Songmu

config.go

@@ -82,6 +82,13 @@ const (
 #         - "YYYY.0M.MICRO" -> 2026.01.0
 #         - "YY.0M0D.MICRO" -> 26.0123.0
 #
+#   tagpr.fixedMajorVersion (Optional)
+#       Fix the major version for releases. When set, tagpr only considers tags
+#       with this major version. Useful for maintaining multiple major versions
+#       on different branches (e.g., v1 branch for v1.x.x, main for v2.x.x).
+#       Accepts both numeric ("1") and v-prefixed ("v1") formats.
+#       Cannot be used with calendarVersioning.
+#
 [tagpr]
 `
 	defaultMajorLabels              = "major"
@@ -107,6 +114,7 @@ const (
 	envChangelogFile                = "TAGPR_CHANGELOG_FILE"
 	envCalendarVersioning           = "TAGPR_CALENDAR_VERSIONING"
 	envReleaseYAMLPath              = "TAGPR_RELEASE_YAML_PATH"
+	envFixedMajorVersion            = "TAGPR_FIXED_MAJOR_VERSION"
 	configReleaseBranch             = "tagpr.releaseBranch"
 	configVersionFile               = "tagpr.versionFile"
 	configVPrefix                   = "tagpr.vPrefix"
@@ -123,6 +131,7 @@ const (
 	configChangelogFile             = "tagpr.changelogFile"
 	configCalendarVersioning        = "tagpr.calendarVersioning"
 	configReleaseYAMLPath           = "tagpr.releaseYAMLPath"
+	configFixedMajorVersion         = "tagpr.fixedMajorVersion"
 )
 
 type config struct {
@@ -142,6 +151,7 @@ type config struct {
 	changelogFile      *string
 	calendarVersioning *string
 	releaseYamlPath    *string
+	fixedMajorVersion  *string
 
 	conf      string
 	gitconfig *gitconfig.Config
@@ -201,6 +211,12 @@ func (cfg *config) Reload() error {
 		return err
 	}
 
+	cfg.reloadField(&cfg.fixedMajorVersion, configFixedMajorVersion, envFixedMajorVersion, "")
+
+	if _, err := cfg.FixedMajorVersion(); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -430,3 +446,16 @@ func validateCalendarVersioningFormat(format string) error {
 func (cfg *config) ReleaseYAMLPath() string {
 	return stringify(cfg.releaseYamlPath)
 }
+
+func (cfg *config) FixedMajorVersion() (*uint64, error) {
+	s := stringify(cfg.fixedMajorVersion)
+	if s == "" {
+		return nil, nil
+	}
+	s = strings.TrimPrefix(s, "v")
+	v, err := strconv.ParseUint(s, 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("invalid fixedMajorVersion %q: %w", stringify(cfg.fixedMajorVersion), err)
+	}
+	return &v, nil
+}

config_test.go

@@ -233,3 +233,48 @@ func TestConfigCalendarVersioningRejectsMajorMinorFromEnv(t *testing.T) {
 		t.Error("expected error for MAJOR token in env")
 	}
 }
+
+func TestFixedMajorVersion(t *testing.T) {
+	tests := []struct {
+		input   string
+		want    *uint64
+		wantErr bool
+	}{
+		{"1", ptr(uint64(1)), false},
+		{"10", ptr(uint64(10)), false},
+		{"v1", ptr(uint64(1)), false},
+		{"v10", ptr(uint64(10)), false},
+		{"", nil, false},
+		{"abc", nil, true},
+		{"v", nil, true},
+		{"-1", nil, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			cfg := &config{
+				fixedMajorVersion: &tt.input,
+			}
+			got, err := cfg.FixedMajorVersion()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("FixedMajorVersion(%q) error = %v, wantErr %v", tt.input, err, tt.wantErr)
+				return
+			}
+			if tt.want == nil {
+				if got != nil {
+					t.Errorf("FixedMajorVersion(%q) = %v, want nil", tt.input, *got)
+				}
+			} else {
+				if got == nil {
+					t.Errorf("FixedMajorVersion(%q) = nil, want %v", tt.input, *tt.want)
+				} else if *got != *tt.want {
+					t.Errorf("FixedMajorVersion(%q) = %v, want %v", tt.input, *got, *tt.want)
+				}
+			}
+		})
+	}
+}
+
+func ptr[T any](v T) *T {
+	return &v
+}

tagpr.go

@@ -53,18 +53,31 @@ func (tp *tagpr) latestSemverTag() string {
 		GitPath:   tp.gitPath,
 		TagPrefix: tp.cfg.TagPrefix(),
 	}).VersionStrings()
-	if tp.cfg.vPrefix != nil {
-		for _, v := range vers {
-			// Strip prefix to check vPrefix against semver part
-			semvPart := strings.TrimPrefix(v, tp.normalizedTagPrefix)
+
+	fixedMajor, _ := tp.cfg.FixedMajorVersion()
+
+	for _, v := range vers {
+		semvPart := strings.TrimPrefix(v, tp.normalizedTagPrefix)
+
+		// Filter by fixedMajorVersion
+		if fixedMajor != nil {
+			sv, err := newSemver(semvPart)
+			if err != nil {
+				continue
+			}
+			if sv.sv.Major() != *fixedMajor {
+				continue
+			}
+		}
+
+		// Filter by vPrefix
+		if tp.cfg.vPrefix != nil {
 			if strings.HasPrefix(semvPart, "v") == *tp.cfg.vPrefix {
 				return v
 			}
-		}
-	} else {
-		// When vPrefix is not defined (i.e. first time tagpr setup), just return the first value.
-		if len(vers) > 0 {
-			return vers[0]
+		} else {
+			// When vPrefix is not defined (i.e. first time tagpr setup), just return the first matching value.
+			return v
 		}
 	}
 	return ""