From 726992f9db9cbeff171818cf2c89b9320dba16a9 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Fri, 21 Apr 2023 14:43:24 -0700 Subject: [PATCH] call kube::golang::setup_env before setting up worktree --- hack/update-yamlfmt.sh | 2 +- hack/verify-internal-modules.sh | 2 ++ hack/verify-licenses.sh | 3 ++- hack/verify-mocks.sh | 2 ++ hack/verify-yamlfmt.sh | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hack/update-yamlfmt.sh b/hack/update-yamlfmt.sh index e3c36e16155..ca784eb3997 100755 --- a/hack/update-yamlfmt.sh +++ b/hack/update-yamlfmt.sh @@ -21,7 +21,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::verify_go_version +kube::golang::setup_env cd "${KUBE_ROOT}" diff --git a/hack/verify-internal-modules.sh b/hack/verify-internal-modules.sh index 8ec9678e17f..fe9c0381aa7 100755 --- a/hack/verify-internal-modules.sh +++ b/hack/verify-internal-modules.sh @@ -22,6 +22,8 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" kube::util::ensure_clean_working_dir +# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. +kube::golang::setup_env _tmpdir="$(kube::realpath "$(mktemp -d -t verify-internal-modules.XXXXXX)")" #kube::util::trap_add "rm -rf ${_tmpdir}" EXIT diff --git a/hack/verify-licenses.sh b/hack/verify-licenses.sh index 0987e714ea3..a8907a5d5e5 100755 --- a/hack/verify-licenses.sh +++ b/hack/verify-licenses.sh @@ -27,7 +27,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" -kube::golang::verify_go_version +# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. +kube::golang::setup_env kube::util::ensure-temp-dir diff --git a/hack/verify-mocks.sh b/hack/verify-mocks.sh index 07452c7e7db..4fa0db12237 100755 --- a/hack/verify-mocks.sh +++ b/hack/verify-mocks.sh @@ -31,6 +31,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" export GO111MODULE=on kube::util::ensure_clean_working_dir +# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. +kube::golang::setup_env _tmpdir="$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")" git worktree add -f -q "${_tmpdir}" HEAD diff --git a/hack/verify-yamlfmt.sh b/hack/verify-yamlfmt.sh index cea2c7edde3..284b318fe24 100755 --- a/hack/verify-yamlfmt.sh +++ b/hack/verify-yamlfmt.sh @@ -28,6 +28,8 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" kube::util::ensure_clean_working_dir +# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. +kube::golang::setup_env _tmpdir="$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")" git worktree add -f -q "${_tmpdir}" HEAD