github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29920 from thockin/verify-godeps-results

Browse Source 
Automatic merge from submit-queue

Make verify-godeps check the results

Verify the results of godep restore/save.  When forced to run this finds a handful of real deltas that need to be resolved.

Fixes #29402

@rmmh because you wrote  #29571 which is the major culprit
This commit is contained in:
Kubernetes Submit Queue
2016-08-04 03:37:44 -07:00
committed by GitHub
parent 10b0f58f51 b9d68ab566
commit 0e55753dcc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hack/verify-godeps.sh
View File

@@ -104,5 +104,12 @@ if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-m
exit 1 exit 1
fi fi
if ! _out="$(diff -Naupr ${KUBE_ROOT}/vendor ${_kubetmp}/vendor)"; then
echo "Your vendored results are different:"
echo "${_out}"
echo "Godeps Verify failed."
exit 1
fi
echo "Godeps Verified." echo "Godeps Verified."
# ex: ts=2 sw=2 et filetype=sh # ex: ts=2 sw=2 et filetype=sh