Move check for EmitNewerGoVersionNeeded diagnostic

owen-mc · owen-mc · commit d30b736eb2ef · 2023-05-03T16:52:48.000+01:00
This should only be done when --identify-environment has not been passed
diff --git a/go/extractor/cli/go-autobuilder/go-autobuilder.go b/go/extractor/cli/go-autobuilder/go-autobuilder.go
@@ -282,10 +282,6 @@ func tryReadGoDirective(depMode DependencyInstallerMode) (string, bool) {
 				found = true
 				if len(matches) > 1 {
 					version = string(matches[1])
-					semverVersion := "v" + version
-					if semver.Compare(semverVersion, getEnvGoSemVer()) >= 0 {
-						diagnostics.EmitNewerGoVersionNeeded()
-					}
 				}
 			}
 		}
@@ -672,7 +668,11 @@ func installDependenciesAndBuild() {
 		os.Setenv("GO111MODULE", "auto")
 	}
 
-	_, goModVersionFound := tryReadGoDirective(depMode)
+	goModVersion, goModVersionFound := tryReadGoDirective(depMode)
+
+	if semver.Compare("v"+goModVersion, getEnvGoSemVer()) >= 0 {
+		diagnostics.EmitNewerGoVersionNeeded()
+	}
 
 	modMode := getModMode(depMode)
 	modMode = fixGoVendorIssues(modMode, depMode, goModVersionFound)

Original file line number	Diff line number	Diff line change
`@@ -282,10 +282,6 @@ func tryReadGoDirective(depMode DependencyInstallerMode) (string, bool) {`
`282`	`282`	`found = true`
`283`	`283`	`if len(matches) > 1 {`
`284`	`284`	`version = string(matches[1])`
`285`		`- semverVersion := "v" + version`
`286`		`- if semver.Compare(semverVersion, getEnvGoSemVer()) >= 0 {`
`287`		`- diagnostics.EmitNewerGoVersionNeeded()`
`288`		`- }`
`289`	`285`	`}`
`290`	`286`	`}`
`291`	`287`	`}`
`@@ -672,7 +668,11 @@ func installDependenciesAndBuild() {`
`672`	`668`	`os.Setenv("GO111MODULE", "auto")`
`673`	`669`	`}`
`674`	`670`
`675`		`- _, goModVersionFound := tryReadGoDirective(depMode)`
	`671`	`+ goModVersion, goModVersionFound := tryReadGoDirective(depMode)`
	`672`	`+`
	`673`	`+ if semver.Compare("v"+goModVersion, getEnvGoSemVer()) >= 0 {`
	`674`	`+ diagnostics.EmitNewerGoVersionNeeded()`
	`675`	`+ }`
`676`	`676`
`677`	`677`	`modMode := getModMode(depMode)`
`678`	`678`	`modMode = fixGoVendorIssues(modMode, depMode, goModVersionFound)`