hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-26 17:25:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modify buildInfo inside function fixGoVendorIssues

Browse Source
This commit is contained in:
Owen Mansel-Chan
2023-06-30 11:02:24 +01:00
parent 6c89c60900
commit 5864bdc1af
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
go/extractor/cli/go-autobuilder/go-autobuilder.go
View File

@@ -401,7 +401,7 @@ func getModMode(depMode DependencyInstallerMode, baseDir string) ModMode {
}
// fixGoVendorIssues fixes issues with go vendor for go version >= 1.14
func fixGoVendorIssues(buildInfo BuildInfo, goModVersionFound bool) ModMode {
func fixGoVendorIssues(buildInfo *BuildInfo, goModVersionFound bool) {
if buildInfo.ModMode == ModVendor {
// fix go vendor issues with go versions >= 1.14 when no go version is specified in the go.mod
// if this is the case, and dependencies were vendored with an old go version (and therefore
@@ -421,13 +421,12 @@ func fixGoVendorIssues(buildInfo BuildInfo, goModVersionFound bool) ModMode {
log.Println("Adding a version directive to the go.mod file as the modules.txt does not have explicit annotations")
if !addVersionToMod("1.13") {
log.Println("Failed to add a version to the go.mod file to fix explicitly required package bug; not using vendored dependencies")
return ModMod
buildInfo.ModMode = ModMod
}
}
}
}
}
return buildInfo.ModMode
}
// Determines whether the project needs a GOPATH set up
@@ -778,7 +777,7 @@ func installDependenciesAndBuild() {
diagnostics.EmitNewerGoVersionNeeded()
}
buildInfo.ModMode = fixGoVendorIssues(buildInfo, goModVersionFound)
fixGoVendorIssues(&buildInfo, goModVersionFound)
tryUpdateGoModAndGoSum(buildInfo)