mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-07 12:11:43 +00:00
Remove build dependency on godep
Instead of using `godep path`, we can simply set the GOPATH directly to point to the Godeps/_workspace. We can still use `godep` to manage the dependencies on the Godeps/ tree, but we don't need to have it available for straight builds from git. v2: Rebased and moved to inside kube::setup_go_environment() function. Tested: - Built it without godep in $PATH: $ hack/build-go.sh - Ran unit tests without godep in $PATH: $ hack/test-go.sh - Retested after rebase. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
This commit is contained in:
@@ -40,9 +40,9 @@ function gitcommit() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# kube::setup_go_environment will check that `go` and `godep` commands are
|
||||
# available in ${PATH}. If not running on Travis, it will also check that the Go
|
||||
# version is good enough for the Kubernetes build.
|
||||
# kube::setup_go_environment will check that the `go` commands is available in
|
||||
# ${PATH}. If not running on Travis, it will also check that the Go version is
|
||||
# good enough for the Kubernetes build.
|
||||
#
|
||||
# Also set ${GOPATH} and environment variables needed by Go.
|
||||
kube::setup_go_environment() {
|
||||
@@ -52,12 +52,6 @@ kube::setup_go_environment() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z "$(which godep)" ]]; then
|
||||
echo "Can't find 'godep' in PATH, please fix and retry." >&2
|
||||
echo "See https://github.com/GoogleCloudPlatform/kubernetes#godep-and-dependency-management" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Travis continuous build uses a head go release that doesn't report
|
||||
# a version number, so we skip this check on Travis. Its unnecessary
|
||||
# there anyway.
|
||||
@@ -72,8 +66,8 @@ kube::setup_go_environment() {
|
||||
fi
|
||||
fi
|
||||
|
||||
# TODO: get rid of this after PR #1054 gets rid of godep.
|
||||
GOPATH="${KUBE_TARGET}:$(godep path)"
|
||||
# Set GOPATH to point to the tree maintained by `godep`.
|
||||
GOPATH="${KUBE_TARGET}:${KUBE_REPO_ROOT}/Godeps/_workspace"
|
||||
export GOPATH
|
||||
|
||||
# Unset GOBIN in case it already exsits in the current session.
|
||||
|
Reference in New Issue
Block a user