-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmd/go: use .mod instead of .zip to determine if version has go.mod file
When checking for updates, the go command checks whether the highest compatible version has a go.mod file in order to determine whether +incompatible versions may be considered "latest". Previously, to perform this check, the go command would download the content of the module (the .zip file) to see whether a go.mod file was present at the root. This is slower than necessary, and it caused 'go list -m -u' to try to save the sum for the .zip file in go.sum in some cases. With this change, the go command only downloads the .mod file and checks whether it appears to be a fake file generated for a version that didn't have a go.mod file. This is faster and requires less verification. Fake files only have a "module" directive. It's possible to commit a file that passes this test, but it would be difficult to do accidentally: Go 1.12 and later at least add a "go" directive. A false positive here would cause version queries to have slightly different results but would not affect builds. Fixes #47377 Change-Id: Ie5ffd0b45e39bd0921328a60af99a9f6e5ab6346 Reviewed-on: https://go-review.googlesource.com/c/go/+/337850 Trust: Jay Conrod <jayconrod@google.com> Run-TryBot: Jay Conrod <jayconrod@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Michael Matloob <matloob@golang.org>
- Loading branch information
Jay Conrod
committed
Jul 27, 2021
1 parent
c8cf0f7
commit 7cd10c1
Showing
4 changed files
with
114 additions
and
56 deletions.
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
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
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
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,34 @@ | ||
# When finding the latest version of a module, we should not download version | ||
# contents. Previously, we downloaded .zip files to determine whether a real | ||
# .mod file was present in order to decide whether +incompatible versions | ||
# could be "latest". | ||
# | ||
# Verifies #47377. | ||
|
||
# rsc.io/breaker has two versions, neither of which has a .mod file. | ||
go list -m -versions rsc.io/breaker | ||
stdout '^rsc.io/breaker v1.0.0 v2.0.0\+incompatible$' | ||
go mod download rsc.io/breaker@v1.0.0 | ||
! grep '^go' $GOPATH/pkg/mod/cache/download/rsc.io/breaker/@v/v1.0.0.mod | ||
go mod download rsc.io/breaker@v2.0.0+incompatible | ||
! grep '^go' $GOPATH/pkg/mod/cache/download/rsc.io/breaker/@v/v2.0.0+incompatible.mod | ||
|
||
# Delete downloaded .zip files. | ||
go clean -modcache | ||
|
||
# Check for updates. | ||
go list -m -u rsc.io/breaker | ||
stdout '^rsc.io/breaker v1.0.0 \[v2.0.0\+incompatible\]$' | ||
|
||
# We should not have downloaded zips. | ||
! exists $GOPATH/pkg/mod/cache/download/rsc.io/breaker/@v/v1.0.0.zip | ||
! exists $GOPATH/pkg/mod/cache/download/rsc.io/breaker/@v/v2.0.0+incompatible.zip | ||
|
||
-- go.mod -- | ||
module m | ||
|
||
go 1.16 | ||
|
||
require rsc.io/breaker v1.0.0 | ||
-- go.sum -- | ||
rsc.io/breaker v1.0.0/go.mod h1:s5yxDXvD88U1/ESC23I2FK3Lkv4YIKaB1ij/Hbm805g= |