646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
27 lines
1.7 KiB
Diff
27 lines
1.7 KiB
Diff
diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go
|
|
index a3105b6b6d..0e10154a70 100644
|
|
--- a/src/cmd/go/internal/modload/import.go
|
|
+++ b/src/cmd/go/internal/modload/import.go
|
|
@@ -345,7 +345,7 @@ func importFromModules(ctx context.Context, path string, rs *Requirements, mg *M
|
|
// vendor/modules.txt does not exist or the user manually added directories to the vendor directory.
|
|
// Go 1.23 and later require vendored packages to be present in modules.txt to be imported.
|
|
_, ok := vendorPkgModule[path]
|
|
- if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) {
|
|
+ if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" {
|
|
mods = append(mods, vendorPkgModule[path])
|
|
dirs = append(dirs, dir)
|
|
roots = append(roots, vendorDir)
|
|
diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go
|
|
index b2cb44100e..05bf3829d5 100644
|
|
--- a/src/cmd/go/internal/modload/vendor.go
|
|
+++ b/src/cmd/go/internal/modload/vendor.go
|
|
@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m
|
|
panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes)))
|
|
}
|
|
index := indexes[0]
|
|
- if gover.Compare(index.goVersion, "1.14") < 0 {
|
|
+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
|
|
// Go versions before 1.14 did not include enough information in
|
|
// vendor/modules.txt to check for consistency.
|
|
// If we know that we're on an earlier version, relax the consistency check.
|