github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

build: add ginkgo aliases for WHAT

Browse Source 
The alias for vendor/github.com/onsi/ginkgo/ginkgo ensures that code like
30e99cb2a9/experiment/kind-conformance-image-e2e.sh (L110)
continues to work. The one without "vendor/" is there just in case that it
was used because it also worked.

Long term, "ginkgo" is a nicer, version independent alias. It gets used
internally to avoid future churn and gets documented also publicly in the
Makefile help.

The caveat is that there's no guarantee that a future v3 CLI will be compatible
with current invocations. But the most common usage is through
hack/ginkgo-e2e.sh, which can deal with such differences.
This commit is contained in:
Patrick Ohly 2022-06-08 08:37:45 +02:00 committed by Dave Chen
parent 05c513d5bf
commit f7427d07e0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/root/Makefile
View File

@ -70,6 +70,8 @@ define ALL_HELP_INFO
# WHAT: Directory names to build. If any of these directories has a 'main' # WHAT: Directory names to build. If any of these directories has a 'main'
# package, the build will produce executable files under $(OUT_DIR)/bin. # package, the build will produce executable files under $(OUT_DIR)/bin.
# If not specified, "everything" will be built. # If not specified, "everything" will be built.
# "vendor/<module>/<path>" is accepted as alias for "<module>/<path>".
# "ginkgo" is an alias for the ginkgo CLI.
# GOFLAGS: Extra flags to pass to 'go' when building. # GOFLAGS: Extra flags to pass to 'go' when building.
# GOLDFLAGS: Extra linking flags passed to 'go' when building. # GOLDFLAGS: Extra linking flags passed to 'go' when building.
# GOGCFLAGS: Additional go compile flags passed to 'go' when building. # GOGCFLAGS: Additional go compile flags passed to 'go' when building.

15
hack/lib/golang.sh
View File

@ -111,7 +111,7 @@ readonly KUBE_SERVER_IMAGE_BINARIES=("${KUBE_SERVER_IMAGE_TARGETS[@]##*/}")
kube::golang::conformance_image_targets() { kube::golang::conformance_image_targets() {
# NOTE: this contains cmd targets for kube::release::build_conformance_image # NOTE: this contains cmd targets for kube::release::build_conformance_image
local targets=( local targets=(
github.com/onsi/ginkgo/v2/ginkgo ginkgo
test/e2e/e2e.test test/e2e/e2e.test
test/conformance/image/go-runner test/conformance/image/go-runner
cmd/kubectl cmd/kubectl
@ -274,7 +274,7 @@ kube::golang::test_targets() {
cmd/genyaml cmd/genyaml
cmd/genswaggertypedocs cmd/genswaggertypedocs
cmd/linkcheck cmd/linkcheck
github.com/onsi/ginkgo/v2/ginkgo ginkgo
test/e2e/e2e.test test/e2e/e2e.test
test/conformance/image/go-runner test/conformance/image/go-runner
) )
@ -301,7 +301,7 @@ readonly KUBE_TEST_PORTABLE=(
kube::golang::server_test_targets() { kube::golang::server_test_targets() {
local targets=( local targets=(
cmd/kubemark cmd/kubemark
github.com/onsi/ginkgo/v2/ginkgo ginkgo
) )
if [[ "${OSTYPE:-}" == "linux"* ]]; then if [[ "${OSTYPE:-}" == "linux"* ]]; then
@ -382,7 +382,14 @@ kube::golang::is_statically_linked_library() {
kube::golang::binaries_from_targets() { kube::golang::binaries_from_targets() {
local target local target
for target; do for target; do
if [[ "${target}" =~ ^([[:alnum:]]+".")+[[:alnum:]]+"/" ]]; then if [ "${target}" = "ginkgo" ] ||
[ "${target}" = "github.com/onsi/ginkgo/ginkgo" ] ||
[ "${target}" = "vendor/github.com/onsi/ginkgo/ginkgo" ]; then
# Aliases that build the ginkgo CLI for hack/ginkgo-e2e.sh.
# "ginkgo" is the one that is documented in the Makefile. The others
# are for backwards compatibility.
echo "github.com/onsi/ginkgo/v2/ginkgo"
elif [[ "${target}" =~ ^([[:alnum:]]+".")+[[:alnum:]]+"/" ]]; then
# If the target starts with what looks like a domain name, assume it has a # If the target starts with what looks like a domain name, assume it has a
# fully-qualified package name rather than one that needs the Kubernetes # fully-qualified package name rather than one that needs the Kubernetes
# package prepended. # package prepended.