Skip to content

K
k3s
Commit feb73219 authored by Vishnu kannan's avatar Vishnu kannan
Browse files
Options

run godeps twice in validation to include recursive dependencies

Signed-off-by: 's avatarVishnu kannan <vishnuk@google.com>
parent cdeaef2c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
hack/godep-save.sh
View file @ feb73219
...@@ -31,4 +31,7 @@ REQUIRED_BINS=( ...@@ -31,4 +31,7 @@ REQUIRED_BINS=(
pushd "${KUBE_ROOT}" > /dev/null pushd "${KUBE_ROOT}" > /dev/null
GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}" 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 popd > /dev/null
hack/verify-godeps.sh
View file @ feb73219
...@@ -95,6 +95,8 @@ git init > /dev/null 2>&1 ...@@ -95,6 +95,8 @@ git init > /dev/null 2>&1
# Recreate the Godeps using the nice clean set we just downloaded # Recreate the Godeps using the nice clean set we just downloaded
hack/godep-save.sh hack/godep-save.sh
# Run it again to make godep include recursive dependencies.
hack/godep-save.sh
# Test for diffs # 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 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
......
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