scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 10:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Make verify-typecheck.sh only check valid targets for a platform"

Browse Source 
This reverts commit e48aa09340.
This commit is contained in:
Jordan Liggitt
2024-01-19 07:54:31 -08:00
parent fbb2e6293f
commit 8b22cb4696
2 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
hack/verify-typecheck.sh
View File

@@ -28,32 +28,13 @@ kube::golang::verify_go_version
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
ret=0
TYPECHECK_SERIAL="${TYPECHECK_SERIAL:-false}"
SERVER_PLATFORMS=$(echo "${KUBE_SUPPORTED_SERVER_PLATFORMS[@]}" | tr ' ' ',')
CLIENT_PLATFORMS=$(echo "${KUBE_SUPPORTED_CLIENT_PLATFORMS[@]}" | tr ' ' ',')
NODE_PLATFORMS=$(echo "${KUBE_SUPPORTED_NODE_PLATFORMS[@]}" | tr ' ' ',')
TEST_PLATFORMS=$(echo "${KUBE_SUPPORTED_TEST_PLATFORMS[@]}" | tr ' ' ',')
# As of June, 2020 the typecheck tool is written in terms of go/packages, but # As of June, 2020 the typecheck tool is written in terms of go/packages, but
# that library doesn't work well with multiple modules. Until that is done, # that library doesn't work well with multiple modules. Until that is done,
# force this tooling to run in a fake GOPATH. # force this tooling to run in a fake GOPATH.
ret=0
TYPECHECK_SERIAL="${TYPECHECK_SERIAL:-false}"
hack/run-in-gopath.sh \ hack/run-in-gopath.sh \
go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${SERVER_PLATFORMS}" "${KUBE_SERVER_TARGETS[@]}" \ go run test/typecheck/main.go "$@" "--serial=$TYPECHECK_SERIAL" || ret=$?
|| ret=$?
hack/run-in-gopath.sh \
go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${CLIENT_PLATFORMS}" "${KUBE_CLIENT_TARGETS[@]}" \
|| ret=$?
hack/run-in-gopath.sh \
go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${NODE_PLATFORMS}" "${KUBE_NODE_TARGETS[@]}" \
|| ret=$?
# $KUBE_TEST_TARGETS doesn't seem to work like the other TARGETS variables...
hack/run-in-gopath.sh \
go run test/typecheck/main.go "$@" --serial="${TYPECHECK_SERIAL}" --platform "${TEST_PLATFORMS}" test/e2e \
|| ret=$?
if [[ $ret -ne 0 ]]; then if [[ $ret -ne 0 ]]; then
echo "!!! Type Check has failed. This may cause cross platform build failures." >&2 echo "!!! Type Check has failed. This may cause cross platform build failures." >&2
echo "!!! Please see https://git.k8s.io/kubernetes/test/typecheck for more information." >&2 echo "!!! Please see https://git.k8s.io/kubernetes/test/typecheck for more information." >&2

6
test/typecheck/main.go
View File

@@ -294,11 +294,7 @@ func main() {
}() }()
f := false f := false
if len(args) != 0 { serialFprintf(os.Stdout, "type-checking %s\n", plat)
serialFprintf(os.Stdout, "type-checking %s against %s\n", plat, args)
} else {
serialFprintf(os.Stdout, "type-checking %s\n", plat)
}
errors, err := c.verify(plat) errors, err := c.verify(plat)
if err != nil { if err != nil {
serialFprintf(os.Stderr, "ERROR(%s): failed to verify: %v\n", plat, err) serialFprintf(os.Stderr, "ERROR(%s): failed to verify: %v\n", plat, err)