call kube::golang::setup_env before setting up worktree
This commit is contained in:
		| @@ -21,7 +21,7 @@ set -o pipefail | |||||||
| KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. | KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. | ||||||
| source "${KUBE_ROOT}/hack/lib/init.sh" | source "${KUBE_ROOT}/hack/lib/init.sh" | ||||||
|  |  | ||||||
| kube::golang::verify_go_version | kube::golang::setup_env | ||||||
|  |  | ||||||
| cd "${KUBE_ROOT}" | cd "${KUBE_ROOT}" | ||||||
|  |  | ||||||
|   | |||||||
| @@ -22,6 +22,8 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. | |||||||
| source "${KUBE_ROOT}/hack/lib/init.sh" | source "${KUBE_ROOT}/hack/lib/init.sh" | ||||||
|  |  | ||||||
| kube::util::ensure_clean_working_dir | 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)")" | _tmpdir="$(kube::realpath "$(mktemp -d -t verify-internal-modules.XXXXXX)")" | ||||||
| #kube::util::trap_add "rm -rf ${_tmpdir}" EXIT | #kube::util::trap_add "rm -rf ${_tmpdir}" EXIT | ||||||
|   | |||||||
| @@ -27,7 +27,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" | |||||||
| source "${KUBE_ROOT}/hack/lib/util.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 | kube::util::ensure-temp-dir | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -31,6 +31,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" | |||||||
| export GO111MODULE=on | export GO111MODULE=on | ||||||
|  |  | ||||||
| kube::util::ensure_clean_working_dir | 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")")" | _tmpdir="$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")" | ||||||
| git worktree add -f -q "${_tmpdir}" HEAD | git worktree add -f -q "${_tmpdir}" HEAD | ||||||
|   | |||||||
| @@ -28,6 +28,8 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. | |||||||
| source "${KUBE_ROOT}/hack/lib/init.sh" | source "${KUBE_ROOT}/hack/lib/init.sh" | ||||||
|  |  | ||||||
| kube::util::ensure_clean_working_dir | 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")")" | _tmpdir="$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")" | ||||||
| git worktree add -f -q "${_tmpdir}" HEAD | git worktree add -f -q "${_tmpdir}" HEAD | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Benjamin Elder
					Benjamin Elder