github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 12:11:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1054 from filbranden/build_without_godep

Browse Source 
Build without godep
This commit is contained in:
Daniel Smith
2014-08-28 10:07:05 -07:00
parent 1efb3e55bd 510cc8ecdc
commit 8072f69a4c
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hack/config-go.sh
View File

@@ -56,9 +56,9 @@ kube::version_ldflags() {
)
}
# 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() {
@@ -68,12 +68,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.
@@ -88,8 +82,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.