Commit f6a2915f authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski

hack/*.sh: re-add staging dirs to verify+update scripts

parent 22e6bd4c
...@@ -34,11 +34,10 @@ find_files() { ...@@ -34,11 +34,10 @@ find_files() {
-o -wholename './_output' \ -o -wholename './_output' \
-o -wholename './_gopath' \ -o -wholename './_gopath' \
-o -wholename './release' \ -o -wholename './release' \
-o -wholename './staging' \
-o -wholename './target' \ -o -wholename './target' \
-o -wholename '*/third_party/*' \ -o -wholename '*/third_party/*' \
-o -wholename '*/vendor/*' \ -o -wholename '*/vendor/*' \
-o -wholename './staging' \ -o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
\) -prune \ \) -prune \
\) -name '*.go' \) -name '*.go'
} }
......
...@@ -42,7 +42,7 @@ find_files() { ...@@ -42,7 +42,7 @@ find_files() {
-o -wholename './target' \ -o -wholename './target' \
-o -wholename '*/third_party/*' \ -o -wholename '*/third_party/*' \
-o -wholename '*/vendor/*' \ -o -wholename '*/vendor/*' \
-o -wholename './staging' \ -o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
-o -wholename '*/bindata.go' \ -o -wholename '*/bindata.go' \
\) -prune \ \) -prune \
\) -name '*.go' \) -name '*.go'
......
...@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" ...@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::verify_go_version kube::golang::verify_go_version
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/*'; then if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/src/k8s.io/client-go/*vendor/*'; then
echo "!!! Some package aliases break go conventions." echo "!!! Some package aliases break go conventions."
echo "To fix these errors, do not use capitalized or underlined characters" echo "To fix these errors, do not use capitalized or underlined characters"
echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info." echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info."
......
...@@ -37,7 +37,8 @@ find_files() { ...@@ -37,7 +37,8 @@ find_files() {
-o -wholename './target' \ -o -wholename './target' \
-o -wholename '*/third_party/*' \ -o -wholename '*/third_party/*' \
-o -wholename '*/vendor/*' \ -o -wholename '*/vendor/*' \
-o -wholename './staging' \ -o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
-o -wholename './staging/src/k8s.io/client-go/pkg/*' \
\) -prune \ \) -prune \
\) -name '.readonly' \) -name '.readonly'
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment