clarify why TestScript sets GONOSUMDB (#958)

And unset it in gotoolchain.txtar, as that one testscript
does fetch modules from the real proxy.golang.org.

Closes #950.
pull/961/head
Daniel Martí 4 months ago committed by GitHub
parent 87ebebb520
commit 59eee83beb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -90,7 +90,8 @@ func TestScript(t *testing.T) {
} }
env.Setenv("HOST_GOMODCACHE", strings.TrimSpace(string(out))) env.Setenv("HOST_GOMODCACHE", strings.TrimSpace(string(out)))
// We use our own proxy, so avoid sum.golang.org. // We use our own GOPROXY above, so avoid using sum.golang.org,
// as we would fail to update any go.sum file in the testscripts.
env.Setenv("GONOSUMDB", "*") env.Setenv("GONOSUMDB", "*")
// "go build" starts many short-lived Go processes, // "go build" starts many short-lived Go processes,

@ -15,8 +15,11 @@ setup-go ${GOVERSION_BASE}
# We want to use the real GOPROXY so that we can download the newer # We want to use the real GOPROXY so that we can download the newer
# toolchain, and we use the host's GOMODCACHE so we can reuse it. # toolchain, and we use the host's GOMODCACHE so we can reuse it.
# Unset GONOSUMDB to get its default value, as TestScript's setup func
# sets it to "*" to not use sum.golang.org with the testdata/mod modules.
env GOPROXY=proxy.golang.org env GOPROXY=proxy.golang.org
env GOMODCACHE=${HOST_GOMODCACHE} env GOMODCACHE=${HOST_GOMODCACHE}
env GONOSUMDB=
# Verify that we are using an older version of Go. # Verify that we are using an older version of Go.
exec go version exec go version

Loading…
Cancel
Save