hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Go: Respect GOTOOLCHAIN in GetEnvGoVersion if already set

Browse Source
This commit is contained in:
Michael B. Gale
2024-04-15 16:27:01 +01:00
parent ce73c29962
commit c0d2b89de0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
go/extractor/toolchain/toolchain.go
View File

@@ -36,7 +36,14 @@ func GetEnvGoVersion() string {
// being told what's already in 'go.mod'. Setting 'GOTOOLCHAIN' to 'local' will force it
// to use the local Go toolchain instead.
cmd := Version()
cmd.Env = append(os.Environ(), "GOTOOLCHAIN=local")
// If 'GOTOOLCHAIN' is already set, then leave it as is. This allows us to force a specific
// Go version in tests and also allows users to override the system default more generally.
_, hasToolchainVar := os.LookupEnv("GOTOOLCHAIN")
if !hasToolchainVar {
cmd.Env = append(os.Environ(), "GOTOOLCHAIN=local")
}
out, err := cmd.CombinedOutput()
if err != nil {