github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #48685 from sttts/sttts-godep-symlink-workaround 

Automatic merge from submit-queue

godep-save.sh: add workaround and more instructions

Fixes https://github.com/kubernetes/kubernetes/issues/48593, hit again in https://github.com/kubernetes/kubernetes/pull/47232#issuecomment-314025645.
pull/6/head
Kubernetes Submit Queue 2017-07-11 15:37:09 -07:00 committed by GitHub
parent 339932f595 cd2552749f
commit 112d7413f9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/godep-save.sh
View File

@ -52,6 +52,7 @@ pushd "${KUBE_ROOT}" > /dev/null
exit 1 exit 1
fi fi
echo "Running godep save. This will take around 15 minutes."
GOPATH=${GOPATH}:${KUBE_ROOT}/staging godep save "${REQUIRED_BINS[@]}" GOPATH=${GOPATH}:${KUBE_ROOT}/staging godep save "${REQUIRED_BINS[@]}"
# create a symlink in vendor directory pointing to the staging client. This # create a symlink in vendor directory pointing to the staging client. This
@ -63,4 +64,10 @@ pushd "${KUBE_ROOT}" > /dev/null
done done
popd > /dev/null popd > /dev/null
echo "Don't forget to run hack/update-godep-licenses.sh if you added or removed a dependency!" # Workaround broken symlink in docker repo because godep copies the link, but not the target
rm -rf ${KUBE_ROOT}/vendor/github.com/docker/docker/project/
echo
echo "Don't forget to run:"
echo "- hack/update-bazel.sh to recreate the BUILD files"
echo "- hack/update-godep-licenses.sh if you added or removed a dependency!"