From feb732195f9ddd04063d67fbba79ca0dd34cb933 Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Tue, 19 Jul 2016 22:35:35 -0700 Subject: [PATCH] run godeps twice in validation to include recursive dependencies Signed-off-by: Vishnu kannan --- hack/godep-save.sh | 3 +++ hack/verify-godeps.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hack/godep-save.sh b/hack/godep-save.sh index a23fa7abe6a..76bbcde87ff 100755 --- a/hack/godep-save.sh +++ b/hack/godep-save.sh @@ -31,4 +31,7 @@ REQUIRED_BINS=( pushd "${KUBE_ROOT}" > /dev/null GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}" + # A temporary workaround to prevent godep from not including recursive dependencies. + # This can be removed once a restore followed by a save does not drop dependencies. + GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}" popd > /dev/null diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index 16af45a3bf6..92f1796d260 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -95,6 +95,8 @@ git init > /dev/null 2>&1 # Recreate the Godeps using the nice clean set we just downloaded hack/godep-save.sh +# Run it again to make godep include recursive dependencies. +hack/godep-save.sh # Test for diffs if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\":' ${KUBE_ROOT}/Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then