mirror of https://github.com/k3s-io/k3s
Revert "fix shellcheck failures of hack/verify-no-vendor-cycles.sh"
This reverts commit e25e5a63e7
.
k3s-v1.15.3
parent
0252a32342
commit
43c8eb6c36
|
@ -28,6 +28,7 @@
|
|||
./hack/pin-dependency.sh
|
||||
./hack/test-integration.sh
|
||||
./hack/update-vendor.sh
|
||||
./hack/verify-no-vendor-cycles.sh
|
||||
./hack/verify-test-featuregates.sh
|
||||
./test/cmd/batch.sh
|
||||
./test/cmd/certificate.sh
|
||||
|
|
|
@ -18,20 +18,16 @@ set -o errexit
|
|||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||
|
||||
export GO111MODULE=auto
|
||||
|
||||
staging_repos=()
|
||||
while IFS= read -r repo; do
|
||||
staging_repos+=( "${repo}" )
|
||||
done < <(ls "${KUBE_ROOT}/staging/src/k8s.io/")
|
||||
|
||||
staging_repos=($(ls "${KUBE_ROOT}/staging/src/k8s.io/"))
|
||||
staging_repos_pattern=$(IFS="|"; echo "${staging_repos[*]}")
|
||||
|
||||
failed=false
|
||||
while IFS= read -r -d '' i; do
|
||||
deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ./"$i" 2> /dev/null || echo "")
|
||||
for i in $(find vendor/ -type d); do
|
||||
deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ./$i 2> /dev/null || echo "")
|
||||
deps_on_main=$(echo "${deps}" | grep -v "k8s.io/kubernetes/vendor/" | grep "k8s.io/kubernetes" || echo "")
|
||||
if [ -n "${deps_on_main}" ]; then
|
||||
echo "Package ${i} has a cyclic dependency on the main repository."
|
||||
|
@ -42,7 +38,7 @@ while IFS= read -r -d '' i; do
|
|||
echo "Package ${i} has a cyclic dependency on staging repository packages: ${deps_on_staging}"
|
||||
failed=true
|
||||
fi
|
||||
done < <(find vendor/ -type d)
|
||||
done
|
||||
|
||||
if [[ "${failed}" == "true" ]]; then
|
||||
exit 1
|
||||
|
|
Loading…
Reference in New Issue