-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[backport staging-24.11] buildGoModule: fix GO_NO_VENDOR_CHECKS for v…
…1.23+ (#373194)
- Loading branch information
Showing
2 changed files
with
27 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
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. |