Skip to content

K
k3s
Commit 112d7413 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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.
parents 339932f5 cd255274
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
hack/godep-save.sh
View file @ 112d7413
...@@ -52,6 +52,7 @@ pushd "${KUBE_ROOT}" > /dev/null ...@@ -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 ...@@ -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!"
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