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

run godeps twice in validation to include recursive dependencies 

Signed-off-by: Vishnu kannan <vishnuk@google.com>
pull/6/head
Vishnu kannan 2016-07-19 22:35:35 -07:00
parent cdeaef2c05
commit feb732195f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/godep-save.sh
View File

@ -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

2
hack/verify-godeps.sh
View File

@ -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