Skip to content

Commit 5f72845

Browse files
authored
Merge pull request kubernetes#77841 from liggitt/restore-verify-script
Revert "fix shellcheck failures of hack/verify-no-vendor-cycles.sh"
2 parents ca9347f + 43c8eb6 commit 5f72845

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

hack/.shellcheck_failures

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
./hack/pin-dependency.sh
2929
./hack/test-integration.sh
3030
./hack/update-vendor.sh
31+
./hack/verify-no-vendor-cycles.sh
3132
./hack/verify-test-featuregates.sh
3233
./test/cmd/batch.sh
3334
./test/cmd/certificate.sh

hack/verify-no-vendor-cycles.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,16 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
2222

2323
export GO111MODULE=auto
2424

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/"))
3026
staging_repos_pattern=$(IFS="|"; echo "${staging_repos[*]}")
3127

3228
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 "")
3531
deps_on_main=$(echo "${deps}" | grep -v "k8s.io/kubernetes/vendor/" | grep "k8s.io/kubernetes" || echo "")
3632
if [ -n "${deps_on_main}" ]; then
3733
echo "Package ${i} has a cyclic dependency on the main repository."
@@ -42,7 +38,7 @@ while IFS= read -r -d '' i; do
4238
echo "Package ${i} has a cyclic dependency on staging repository packages: ${deps_on_staging}"
4339
failed=true
4440
fi
45-
done < <(find vendor/ -type d)
41+
done
4642

4743
if [[ "${failed}" == "true" ]]; then
4844
exit 1

0 commit comments

Comments
 (0)