File tree Expand file tree Collapse file tree 2 files changed +6
-9
lines changed Expand file tree Collapse file tree 2 files changed +6
-9
lines changed Original file line number Diff line number Diff line change 28
28
./hack/pin-dependency.sh
29
29
./hack/test-integration.sh
30
30
./hack/update-vendor.sh
31
+ ./hack/verify-no-vendor-cycles.sh
31
32
./hack/verify-test-featuregates.sh
32
33
./test/cmd/batch.sh
33
34
./test/cmd/certificate.sh
Original file line number Diff line number Diff line change @@ -18,20 +18,16 @@ set -o errexit
18
18
set -o nounset
19
19
set -o pipefail
20
20
21
- KUBE_ROOT=$( dirname " ${BASH_SOURCE[0] } " ) /..
21
+ KUBE_ROOT=$( dirname " ${BASH_SOURCE} " ) /..
22
22
23
23
export GO111MODULE=auto
24
24
25
- staging_repos=()
26
- while IFS= read -r repo; do
27
- staging_repos+=( " ${repo} " )
28
- done < <( ls " ${KUBE_ROOT} /staging/src/k8s.io/" )
29
-
25
+ staging_repos=($( ls " ${KUBE_ROOT} /staging/src/k8s.io/" ) )
30
26
staging_repos_pattern=$( IFS=" |" ; echo " ${staging_repos[*]} " )
31
27
32
28
failed=false
33
- while IFS= read -r -d ' ' i ; do
34
- deps=$( go list -f ' {{range .Deps}}{{.}}{{"\n"}}{{end}}' ./" $i " 2> /dev/null || echo " " )
29
+ for i in $( find vendor/ -type d ) ; do
30
+ deps=$( go list -f ' {{range .Deps}}{{.}}{{"\n"}}{{end}}' ./$i 2> /dev/null || echo " " )
35
31
deps_on_main=$( echo " ${deps} " | grep -v " k8s.io/kubernetes/vendor/" | grep " k8s.io/kubernetes" || echo " " )
36
32
if [ -n " ${deps_on_main} " ]; then
37
33
echo " Package ${i} has a cyclic dependency on the main repository."
@@ -42,7 +38,7 @@ while IFS= read -r -d '' i; do
42
38
echo " Package ${i} has a cyclic dependency on staging repository packages: ${deps_on_staging} "
43
39
failed=true
44
40
fi
45
- done < <( find vendor/ -type d )
41
+ done
46
42
47
43
if [[ " ${failed} " == " true" ]]; then
48
44
exit 1
You can’t perform that action at this time.
0 commit comments