at master 1.7 kB view raw
1diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go 2index a3105b6b6d..0e10154a70 100644 3--- a/src/cmd/go/internal/modload/import.go 4+++ b/src/cmd/go/internal/modload/import.go 5@@ -345,7 +345,7 @@ func importFromModules(ctx context.Context, path string, rs *Requirements, mg *M 6 // vendor/modules.txt does not exist or the user manually added directories to the vendor directory. 7 // Go 1.23 and later require vendored packages to be present in modules.txt to be imported. 8 _, ok := vendorPkgModule[path] 9- if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) { 10+ if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" { 11 mods = append(mods, vendorPkgModule[path]) 12 dirs = append(dirs, dir) 13 roots = append(roots, vendorDir) 14diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go 15index b2cb44100e..05bf3829d5 100644 16--- a/src/cmd/go/internal/modload/vendor.go 17+++ b/src/cmd/go/internal/modload/vendor.go 18@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m 19 panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) 20 } 21 index := indexes[0] 22- if gover.Compare(index.goVersion, "1.14") < 0 { 23+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { 24 // Go versions before 1.14 did not include enough information in 25 // vendor/modules.txt to check for consistency. 26 // If we know that we're on an earlier version, relax the consistency check.