github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #77055 from SataQiu/fix-shell-20190426 

Fix shellcheck failures of hack/verify-no-vendor-cycles.sh
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-25 16:11:02 -07:00 committed by GitHub
parent a2b50cdc9a e25e5a63e7
commit 5ab36f8cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.shellcheck_failures
View File

@ -32,7 +32,6 @@
./hack/test-integration.sh ./hack/test-integration.sh
./hack/update-vendor.sh ./hack/update-vendor.sh
./hack/verify-golint.sh ./hack/verify-golint.sh
./hack/verify-no-vendor-cycles.sh
./hack/verify-test-featuregates.sh ./hack/verify-test-featuregates.sh
./test/cmd/apply.sh ./test/cmd/apply.sh
./test/cmd/apps.sh ./test/cmd/apps.sh

14
hack/verify-no-vendor-cycles.sh
View File

@ -18,16 +18,20 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
export GO111MODULE=auto export GO111MODULE=auto
staging_repos=($(ls "${KUBE_ROOT}/staging/src/k8s.io/")) staging_repos=()
while IFS= read -r repo; do
staging_repos+=( "${repo}" )
done < <(ls "${KUBE_ROOT}/staging/src/k8s.io/")
staging_repos_pattern=$(IFS="|"; echo "${staging_repos[*]}") staging_repos_pattern=$(IFS="|"; echo "${staging_repos[*]}")
failed=false failed=false
for i in $(find vendor/ -type d); do while IFS= read -r -d '' i; do
deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ./$i 2> /dev/null || echo "") 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 "") deps_on_main=$(echo "${deps}" | grep -v "k8s.io/kubernetes/vendor/" | grep "k8s.io/kubernetes" || echo "")
if [ -n "${deps_on_main}" ]; then if [ -n "${deps_on_main}" ]; then
echo "Package ${i} has a cyclic dependency on the main repository." echo "Package ${i} has a cyclic dependency on the main repository."
@ -38,7 +42,7 @@ for i in $(find vendor/ -type d); do
echo "Package ${i} has a cyclic dependency on staging repository packages: ${deps_on_staging}" echo "Package ${i} has a cyclic dependency on staging repository packages: ${deps_on_staging}"
failed=true failed=true
fi fi
done done < <(find vendor/ -type d)
if [[ "${failed}" == "true" ]]; then if [[ "${failed}" == "true" ]]; then
exit 1 exit 1