Skip to content

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

Merge pull request #43735 from CaoShuFeng/godeprestore

Automatic merge from submit-queue (batch tested with PRs 40885, 43623, 43735) Use "hack/godep-restore.sh" instead of "godep restore" Now we get errors when run "godep restore". So we need to update the help message. @derekwaynecarr **Special notes for your reviewer**: **Release note**: ```NONE ```
parents 9efb1f34 205a5abe
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/update-staging-client-go.sh
View file @ ab892f9d
...@@ -28,7 +28,7 @@ cd ${KUBE_ROOT} ...@@ -28,7 +28,7 @@ cd ${KUBE_ROOT}
echo "Checking whether godeps are restored" echo "Checking whether godeps are restored"
if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then
echo -e '\nRun 'godep restore' to download dependencies.' 1>&2 echo -e '\nExecute script 'hack/godep-restore.sh' to download dependencies.' 1>&2
exit 1 exit 1
fi fi
......
hack/update-staging-godeps.sh
View file @ ab892f9d
...@@ -51,7 +51,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh" ...@@ -51,7 +51,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh"
echo "Checking whether godeps are restored" echo "Checking whether godeps are restored"
if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then
echo -e '\nRun 'godep restore' to download dependencies.' 1>&2 echo -e '\nExecute script 'hack/godep-restore.sh' to download dependencies.' 1>&2
exit 1 exit 1
fi fi
......
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