diff options
| author | Michael Matloob <matloob@golang.org> | 2023-08-09 13:27:44 -0400 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2023-08-10 19:39:58 +0000 |
| commit | 82f79ed16e8817d22bbc99159489de9f1cf805ac (patch) | |
| tree | 90efdee83af306889f072ea83068b61e3a35aeef /cmd/pkgsite | |
| parent | 17236d30855a86d83b4d373b702844f39c29c9b0 (diff) | |
| download | go-x-pkgsite-82f79ed16e8817d22bbc99159489de9f1cf805ac.tar.xz | |
cmd/pkgsite: more changes to use local stdlib
This cl makes more changes to enable using the local stdlib. It always
uses the local stdlib from cmd/pkgsite. It also changes code that
processes and shows versions to expect and pass through v0.0.0, the
fake version we use when we show local packages.
For #57742
Change-Id: Ic407e58e9658b0703dbc6df47f40bbe1f1bd2b2a
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/517915
kokoro-CI: kokoro <noreply+kokoro@google.com>
Run-TryBot: Michael Matloob <matloob@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'cmd/pkgsite')
| -rw-r--r-- | cmd/pkgsite/main.go | 11 | ||||
| -rw-r--r-- | cmd/pkgsite/main_test.go | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cmd/pkgsite/main.go b/cmd/pkgsite/main.go index 01fc9d81..9bf74930 100644 --- a/cmd/pkgsite/main.go +++ b/cmd/pkgsite/main.go @@ -110,6 +110,7 @@ func main() { flag.BoolVar(&serverCfg.useCache, "cache", false, "fetch from the module cache") flag.StringVar(&serverCfg.cacheDir, "cachedir", "", "module cache directory (defaults to `go env GOMODCACHE`)") flag.BoolVar(&serverCfg.useListedMods, "list", true, "for each path, serve all modules in build list") + serverCfg.useLocalStdlib = true flag.Usage = func() { out := flag.CommandLine.Output() @@ -380,11 +381,6 @@ func buildGetters(ctx context.Context, cfg getterConfig) ([]fetch.ModuleGetter, getters = append(getters, g) } - // Add a proxy - if cfg.proxy != nil { - getters = append(getters, fetch.NewProxyModuleGetter(cfg.proxy, source.NewClient(time.Second))) - } - if cfg.useLocalStdlib { goRepo := *goRepoPath if goRepo == "" { @@ -398,6 +394,11 @@ func buildGetters(ctx context.Context, cfg getterConfig) ([]fetch.ModuleGetter, } } + // Add a proxy + if cfg.proxy != nil { + getters = append(getters, fetch.NewProxyModuleGetter(cfg.proxy, source.NewClient(time.Second))) + } + getters = append(getters, fetch.NewStdlibZipModuleGetter()) return getters, nil diff --git a/cmd/pkgsite/main_test.go b/cmd/pkgsite/main_test.go index e17ac699..deac8004 100644 --- a/cmd/pkgsite/main_test.go +++ b/cmd/pkgsite/main_test.go @@ -56,13 +56,12 @@ package a cfg := func(modifyDefault func(*serverConfig)) serverConfig { c := serverConfig{ - paths: []string{localModule}, - gopathMode: false, - useListedMods: true, - useLocalStdlib: true, - useCache: true, - cacheDir: cacheDir, - proxy: prox, + paths: []string{localModule}, + gopathMode: false, + useListedMods: true, + useCache: true, + cacheDir: cacheDir, + proxy: prox, } if modifyDefault != nil { modifyDefault(&c) |