Skip to content

Commit cb4f628

Browse files
committed
Fix --edge flag and tag handling
1 parent d38b34a commit cb4f628

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

main.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,14 @@ func main() {
698698
kingpin.Fatalf(err.Error())
699699
}
700700

701+
// Validate EDGE tag usage - bidirectional check
702+
if strings.HasPrefix(*release, "EDGE.") && !*edge {
703+
kingpin.Fatalf("EDGE-prefixed release tags require --edge flag: %s", *release)
704+
}
705+
if *edge && strings.HasPrefix(*release, "RELEASE.") {
706+
kingpin.Fatalf("--edge flag requires EDGE-prefixed release tag, got: %s", *release)
707+
}
708+
701709
// Skip package building for warp (uses goreleaser) - only generate JSON
702710
if !*noPackages && *appName != "warp" {
703711
if err := doPackage(*appName, *license, *release, *packager, *deps, *scriptsDir); err != nil {
@@ -782,7 +790,7 @@ func releaseTagToReleaseTime(releaseTag string) (releaseTime time.Time, fields [
782790
if len(fields) < 2 || len(fields) > 4 {
783791
return releaseTime, nil, fmt.Errorf("%s is not a valid release tag", releaseTag)
784792
}
785-
if fields[0] != "RELEASE" {
793+
if fields[0] != "RELEASE" && fields[0] != "EDGE" {
786794
return releaseTime, nil, fmt.Errorf("%s is not a valid release tag", releaseTag)
787795
}
788796
releaseTime, err = time.Parse(minioReleaseTagTimeLayout, fields[1])

main_test.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,17 @@ func TestSemVerRelease(t *testing.T) {
4141
expected: "20250312000000.0.0.hotfix.1",
4242
},
4343
{
44-
name: "Invalid format - no RELEASE prefix",
44+
name: "EDGE release tag",
45+
releaseTag: "EDGE.2025-10-10T05-28-23Z",
46+
expected: "20251010052823.0.0",
47+
},
48+
{
49+
name: "EDGE release with hotfix",
50+
releaseTag: "EDGE.2025-10-10T05-28-23Z.hotfix.2",
51+
expected: "20251010052823.0.0.hotfix.2",
52+
},
53+
{
54+
name: "Invalid format - no RELEASE/EDGE prefix",
4555
releaseTag: "2025-03-12T00-00-00Z",
4656
expectPanic: true,
4757
},

0 commit comments

Comments
 (0)