From e55938940d2d95e9cb1ff1def63cc54d7725f774 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Fri, 22 Dec 2017 13:24:00 -0500 Subject: [PATCH] Rewrite go_install_from_commit to handle pkgs that aren't in HEAD This is brittle and really only intended to workaround the fact that gazelle has moved out of the bazelbuild/rules_go repo to its own repo. I would rather see this reverted once we move to the same version of gazelle as used by kubernetes/test-infra --- hack/lib/util.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 1114cca8902..3595a0c6650 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -475,10 +475,15 @@ kube::util::go_install_from_commit() { kube::util::ensure-temp-dir mkdir -p "${KUBE_TEMP}/go/src" - GOPATH="${KUBE_TEMP}/go" go get -d -u "${pkg}" + # TODO(spiffxp): remove this brittle workaround for go getting a package that doesn't exist at HEAD + repo=$(echo ${pkg} | cut -d/ -f1-3) + git clone "https://${repo}" "${KUBE_TEMP}/go/src/${repo}" + # GOPATH="${KUBE_TEMP}/go" go get -d -u "${pkg}" ( - cd "${KUBE_TEMP}/go/src/${pkg}" + cd "${KUBE_TEMP}/go/src/${repo}" + git fetch # TODO(spiffxp): workaround git checkout -q "${commit}" + GOPATH="${KUBE_TEMP}/go" go get -d "${pkg}" #TODO(spiffxp): workaround GOPATH="${KUBE_TEMP}/go" go install "${pkg}" ) PATH="${KUBE_TEMP}/go/bin:${PATH}"