Merge pull request #9577 from smowton/smowton/fix/go-mod-tidy-vendoring

smowton · web-flow · commit a7993fb45535 · 2022-06-17T15:26:59.000+01:00
Go autobuilder: don't attempt a go mod tidy when there's a vendor directory present
diff --git a/go/extractor/cli/go-autobuilder/go-autobuilder.go b/go/extractor/cli/go-autobuilder/go-autobuilder.go
@@ -291,7 +291,7 @@ func main() {
 	}
 
 	// Go 1.16 and later won't automatically attempt to update go.mod / go.sum during package loading, so try to update them here:
-	if depMode == GoGetWithModules && semver.Compare(getEnvGoSemVer(), "1.16") >= 0 {
+	if modMode != ModVendor && depMode == GoGetWithModules && semver.Compare(getEnvGoSemVer(), "1.16") >= 0 {
 		// stat go.mod and go.sum
 		beforeGoModFileInfo, beforeGoModErr := os.Stat("go.mod")
 		if beforeGoModErr != nil {

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ func main() {`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`// Go 1.16 and later won't automatically attempt to update go.mod / go.sum during package loading, so try to update them here:`
`294`		`- if depMode == GoGetWithModules && semver.Compare(getEnvGoSemVer(), "1.16") >= 0 {`
	`294`	`+ if modMode != ModVendor && depMode == GoGetWithModules && semver.Compare(getEnvGoSemVer(), "1.16") >= 0 {`
`295`	`295`	`// stat go.mod and go.sum`
`296`	`296`	`beforeGoModFileInfo, beforeGoModErr := os.Stat("go.mod")`
`297`	`297`	`if beforeGoModErr != nil {`