From 8ef7aaf885e593fdd847693a3ffe8ff276216d1d Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Mon, 14 Sep 2015 11:59:38 -0700 Subject: [PATCH] cleanup vendoring of test deps Signed-off-by: Jessica Frazelle --- hack/.vendor-helpers.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/hack/.vendor-helpers.sh b/hack/.vendor-helpers.sh index c969485968..beed68bc1c 100755 --- a/hack/.vendor-helpers.sh +++ b/hack/.vendor-helpers.sh @@ -88,24 +88,18 @@ clean() { echo -n 'collecting import graph, ' local IFS=$'\n' - packages+=( $( - for platform in "${dockerPlatforms[@]}"; do - export GOOS="${platform%/*}"; - export GOARCH="${platform##*/}"; - for buildTags in "${buildTagCombos[@]}"; do - go list -e -tags "$buildTags" -f '{{join .Deps "\n"}}' "${packages[@]}" - done - done | grep -E "^${PROJECT}" | grep -vE "^${PROJECT}/vendor" | sort -u - ) ) local imports=( $( for platform in "${dockerPlatforms[@]}"; do export GOOS="${platform%/*}"; export GOARCH="${platform##*/}"; for buildTags in "${buildTagCombos[@]}"; do - go list -e -tags "$buildTags" -f '{{join .Deps "\n"}}' "${packages[@]}" - go list -e -tags "$buildTags" -f '{{join .TestImports "\n"}}' "${packages[@]}" + pkgs=( $(go list -e -tags "$buildTags" -f '{{join .Deps "\n"}}' "${packages[@]}" | grep -E "^${PROJECT}" | grep -vE "^${PROJECT}/vendor" | sort -u) ) + pkgs+=( ${packages[@]} ) + testImports=( $(go list -e -tags "$buildTags" -f '{{join .TestImports "\n"}}' "${pkgs[@]}" | sort -u) ) + printf '%s\n' "${testImports[@]}" + go list -e -tags "$buildTags" -f '{{join .Deps "\n"}}' "${packages[@]} ${testImports[@]}" done - done | grep -vE '^${PROJECT}' | sort -u + done | grep -vE "^${PROJECT}" | sort -u ) ) imports=( $(go list -e -f '{{if not .Standard}}{{.ImportPath}}{{end}}' "${imports[@]}") ) unset IFS