Don't ignore requirements defined on go_repo

please-build · Feb 9, 2024 · b0397f1 · b0397f1
1 parent 87c0bb9
commit b0397f1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/tools/please_go/ChangeLog b/tools/please_go/ChangeLog
@@ -1,3 +1,8 @@
+Version 1.10.1
+-------------
+    * Fix regression in 1.10.0 where module requirements passed in through `go_repo` were
+      ignored.
+
 Version 1.10.0
 -------------
     * Inspect both the host repo and the module's go.mod when resolving dependencies in the

diff --git a/tools/please_go/VERSION b/tools/please_go/VERSION
@@ -1 +1 @@
-1.10.0
+1.10.1
diff --git a/tools/please_go/generate/generate.go b/tools/please_go/generate/generate.go
@@ -63,7 +63,10 @@ func (g *Generate) Generate() error {
 	if err != nil {
 		return err
 	}
-	g.moduleDeps = append(deps, g.moduleName)
+	// It's important to not override g.moduleDeps as it can already contains dependencies configured
+	// when `Generate` was constructed.
+	g.moduleDeps = append(g.moduleDeps, deps...)
+	g.moduleDeps = append(g.moduleDeps, g.moduleName)
 	g.replace = replacements
 
 	if err := g.writeConfig(); err != nil {