cmd/gorelease: don't depend on order of requirements in go.mod
CL 237017 caused 'go list' to call modload.WriteGoMod once instead of
twice, which changed the order of requirements in a temporary go.mod
file created by gorelease. Previously, WriteGoMod was called once after
the go version was added, then again after packages were loaded. The
first call did not sort requirements, since packages hadn't been
loaded. The second call didn't write go.mod since no requirements were
missing and go.mod was not considered dirty.
This change makes it so gorelease will only report a diagnostic when
requirements are actually missing. the order of requirements no longer
matters.
Updates golang/go#40775
Change-Id: I5b42104207fbd88dd849b68fb2b5d1ab50ea48c7
Reviewed-on: https://go-review.googlesource.com/c/exp/+/249398
Reviewed-by: Bryan C. Mills <bcmills@google.com>
diff --git a/cmd/gorelease/gorelease.go b/cmd/gorelease/gorelease.go
index dd9afa0..5f26b7f 100644
--- a/cmd/gorelease/gorelease.go
+++ b/cmd/gorelease/gorelease.go
@@ -887,15 +887,16 @@
// Report new requirements in go.mod.
goModPath := filepath.Join(loadDir, "go.mod")
loadReqs := func(data []byte) (string, error) {
- buf := &bytes.Buffer{}
modFile, err := modfile.ParseLax(goModPath, data, nil)
if err != nil {
return "", err
}
- for _, req := range modFile.Require {
- fmt.Fprintf(buf, "%v\n", req.Mod)
+ lines := make([]string, len(modFile.Require))
+ for i, req := range modFile.Require {
+ lines[i] = req.Mod.String()
}
- return buf.String(), nil
+ sort.Strings(lines)
+ return strings.Join(lines, "\n"), nil
}
oldReqs, err := loadReqs(goModData)
