Skip to content

K
k3s
Commit 0d5eb00a authored by Jeff Grafton's avatar Jeff Grafton
Browse files
Options

Revert "Rewrite go_install_from_commit to handle pkgs that aren't in HEAD"

This reverts commit e5593894.
parent c1554d08
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
hack/lib/util.sh
View file @ 0d5eb00a
...@@ -476,15 +476,10 @@ kube::util::go_install_from_commit() { ...@@ -476,15 +476,10 @@ kube::util::go_install_from_commit() {
kube::util::ensure-temp-dir kube::util::ensure-temp-dir
mkdir -p "${KUBE_TEMP}/go/src" mkdir -p "${KUBE_TEMP}/go/src"
# TODO(spiffxp): remove this brittle workaround for go getting a package that doesn't exist at HEAD GOPATH="${KUBE_TEMP}/go" go get -d -u "${pkg}"
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/${repo}" cd "${KUBE_TEMP}/go/src/${pkg}"
git fetch # TODO(spiffxp): workaround
git checkout -q "${commit}" git checkout -q "${commit}"
GOPATH="${KUBE_TEMP}/go" go get -d "${pkg}" #TODO(spiffxp): workaround
GOPATH="${KUBE_TEMP}/go" go install "${pkg}" GOPATH="${KUBE_TEMP}/go" go install "${pkg}"
) )
PATH="${KUBE_TEMP}/go/bin:${PATH}" PATH="${KUBE_TEMP}/go/bin:${PATH}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment