Skip to content

Commit f6a2915

Browse files
committed
hack/*.sh: re-add staging dirs to verify+update scripts
1 parent 22e6bd4 commit f6a2915

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

hack/update-gofmt.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ find_files() {
3434
-o -wholename './_output' \
3535
-o -wholename './_gopath' \
3636
-o -wholename './release' \
37-
-o -wholename './staging' \
3837
-o -wholename './target' \
3938
-o -wholename '*/third_party/*' \
4039
-o -wholename '*/vendor/*' \
41-
-o -wholename './staging' \
40+
-o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
4241
\) -prune \
4342
\) -name '*.go'
4443
}

hack/verify-gofmt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ find_files() {
4242
-o -wholename './target' \
4343
-o -wholename '*/third_party/*' \
4444
-o -wholename '*/vendor/*' \
45-
-o -wholename './staging' \
45+
-o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
4646
-o -wholename '*/bindata.go' \
4747
\) -prune \
4848
\) -name '*.go'

hack/verify-pkg-names.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
2626
kube::golang::verify_go_version
2727

2828
cd "${KUBE_ROOT}"
29-
if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/*'; then
29+
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
3030
echo "!!! Some package aliases break go conventions."
3131
echo "To fix these errors, do not use capitalized or underlined characters"
3232
echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info."

hack/verify-readonly-packages.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ find_files() {
3737
-o -wholename './target' \
3838
-o -wholename '*/third_party/*' \
3939
-o -wholename '*/vendor/*' \
40-
-o -wholename './staging' \
40+
-o -wholename './staging/src/k8s.io/client-go/*vendor/*' \
41+
-o -wholename './staging/src/k8s.io/client-go/pkg/*' \
4142
\) -prune \
4243
\) -name '.readonly'
4344
}

0 commit comments

Comments
 (0)