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