toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16294 from jfrazelle/cleanup-vendor

Browse Source 
cleanup vendoring of test deps
Upstream-commit: 0ac28f5e4858ae47a4f452959c722375e587e12f
Component: engine
This commit is contained in:
Arnaud Porterie
2015-09-16 15:45:36 -07:00
parent 6e1d19dd58 c4c2af06ea
commit 3cfc4f37fa
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/.vendor-helpers.sh
+6 -12
View File
@@ -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