root/golib
1
0
Fork 0
mirror of https://github.com/therootcompany/golib.git synced 2026-03-02 23:57:59 +00:00
Code Issues Projects Releases Wiki Activity

feat(monorel): validate existing .goreleaser.yaml instead of diffing content

Browse Source 
Replace the exact-content comparison with yamlLooksCorrect(), which checks
three semantic markers:

  - -X main.version={{.Env.VERSION}} present (version injection)
  - <binname>_{{ .Env.VERSION }}_ present for every binary (archive naming)
  - {{ .ProjectName }} / {{.ProjectName}} absent (not a stock template)

If the file passes all checks it is left completely untouched, preserving
any compatible local edits. Only files that fail a check are regenerated.
This commit is contained in:
AJ ONeal 2026-03-01 00:10:36 -07:00
parent 833c68e708
commit 98bdc47746
No known key found for this signature in database
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/monorel/main.go
View File

@ -317,7 +317,7 @@ func initModuleGroup(group *moduleGroup, dryRun bool) {
yamlPath := filepath.Join(modRoot, ".goreleaser.yaml") yamlPath := filepath.Join(modRoot, ".goreleaser.yaml")
existing, readErr := os.ReadFile(yamlPath) existing, readErr := os.ReadFile(yamlPath)
isNewFile := readErr != nil isNewFile := readErr != nil
isChanged := isNewFile || string(existing) != yamlContent isChanged := isNewFile || !yamlLooksCorrect(string(existing), bins)
if dryRun { if dryRun {
if isChanged { if isChanged {
fmt.Fprintf(os.Stderr, "[dry-run] would write %s\n", yamlPath) fmt.Fprintf(os.Stderr, "[dry-run] would write %s\n", yamlPath)
@ -966,9 +966,10 @@ func processModule(group *moduleGroup, relPath string) {
yamlPath := filepath.Join(modRoot, ".goreleaser.yaml") yamlPath := filepath.Join(modRoot, ".goreleaser.yaml")
existing, readErr := os.ReadFile(yamlPath) existing, readErr := os.ReadFile(yamlPath)
isNewFile := readErr != nil isNewFile := readErr != nil
isChanged := isNewFile || string(existing) != yamlContent isChanged := isNewFile || !yamlLooksCorrect(string(existing), bins)
if !isNewFile && isChanged { if !isNewFile && isChanged {
// Warn if a stock {{ .ProjectName }} template is in use. // Warn if a stock {{ .ProjectName }} template is in use (one of the
// reasons yamlLooksCorrect may have returned false).
hasProjectName := strings.Contains(string(existing), "{{ .ProjectName }}") || hasProjectName := strings.Contains(string(existing), "{{ .ProjectName }}") ||
strings.Contains(string(existing), "{{.ProjectName}}") strings.Contains(string(existing), "{{.ProjectName}}")
gitInfo, gitErr := os.Stat(filepath.Join(modRoot, ".git")) gitInfo, gitErr := os.Stat(filepath.Join(modRoot, ".git"))
@ -1243,6 +1244,31 @@ func goreleaserYAML(projectName string, bins []binary) string {
return b.String() return b.String()
} }
// yamlLooksCorrect returns true when content appears to be a valid monorel-
// generated (or compatible) .goreleaser.yaml for the given binaries:
//
// - `-X main.version={{.Env.VERSION}}` is present (version injection)
// - `<binname>_{{ .Env.VERSION }}_` is present for every binary (archive naming)
// - `{{ .ProjectName }}` / `{{.ProjectName}}` are absent (stock goreleaser template)
//
// When these hold the file is left untouched so that compatible local edits
// (e.g. adding extra build targets or tweaking flags) are preserved.
func yamlLooksCorrect(content string, bins []binary) bool {
if !strings.Contains(content, "-X main.version={{.Env.VERSION}}") {
return false
}
for _, bin := range bins {
if !strings.Contains(content, bin.name+"_{{ .Env.VERSION }}_") {
return false
}
}
if strings.Contains(content, "{{ .ProjectName }}") ||
strings.Contains(content, "{{.ProjectName}}") {
return false
}
return true
}
// ── Release script generation ────────────────────────────────────────────── // ── Release script generation ──────────────────────────────────────────────
// printModuleScript emits one module's release steps to stdout. // printModuleScript emits one module's release steps to stdout.