Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 4cafa3e

Browse files
committed
Ignore _gopath in verify scripts
The _gopath directory is used in Jenkins to install extra dependencies, and any files in it should be ignored by the various verification scripts.
1 parent 4d18186 commit 4cafa3e

File tree

6 files changed

+9
-3
lines changed

6 files changed

+9
-3
lines changed

hack/after-build/verify-description.sh

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ find_files() {
3333
\( \
3434
-wholename './output' \
3535
-o -wholename './_output' \
36+
-o -wholename './_gopath' \
3637
-o -wholename './release' \
3738
-o -wholename './target' \
3839
-o -wholename '*/third_party/*' \

hack/boilerplate/boilerplate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def file_passes(filename, refs, regexs):
9595
def file_extension(filename):
9696
return os.path.splitext(filename)[1].split(".")[-1].lower()
9797

98-
skipped_dirs = ['Godeps', 'third_party', '_output', '.git']
98+
skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git']
9999
def normalize_files(files):
100100
newfiles = []
101101
for pathname in files:

hack/lib/util.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,12 @@ kube::util::gen-analytics() {
241241
else
242242
dir="${path}"
243243
fi
244-
# We don't touch files in Godeps|third_party, and the kubectl
244+
# We don't touch files in Godeps|third_party|_gopath, and the kubectl
245245
# docs are autogenerated by gendocs.
246246
mdfiles=($( find "${dir}" -name "*.md" -type f \
247247
-not -path "${path}/Godeps/*" \
248248
-not -path "${path}/third_party/*" \
249+
-not -path "${path}/_gopath/*" \
249250
-not -path "${path}/_output/*" \
250251
-not -path "${path}/docs/user-guide/kubectl/kubectl*" ))
251252
for f in "${mdfiles[@]}"; do

hack/update-gofmt.sh

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ find_files() {
3636
\( \
3737
-wholename './output' \
3838
-o -wholename './_output' \
39+
-o -wholename './_gopath' \
3940
-o -wholename './release' \
4041
-o -wholename './target' \
4142
-o -wholename '*/third_party/*' \

hack/verify-flags-underscore.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ def get_all_files(rootdir):
5555
# don't visit certain dirs
5656
if 'Godeps' in dirs:
5757
dirs.remove('Godeps')
58+
if '_gopath' in dirs:
59+
dirs.remove('_gopath')
5860
if 'third_party' in dirs:
5961
dirs.remove('third_party')
6062
if '.git' in dirs:
@@ -77,7 +79,7 @@ def get_all_files(rootdir):
7779

7880
def normalize_files(rootdir, files):
7981
newfiles = []
80-
a = ['Godeps', 'third_party', 'exceptions.txt', 'known-flags.txt']
82+
a = ['Godeps', '_gopath', 'third_party', '.git', 'exceptions.txt', 'known-flags.txt']
8183
for f in files:
8284
if any(x in f for x in a):
8385
continue

hack/verify-gofmt.sh

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ find_files() {
3636
\( \
3737
-wholename './output' \
3838
-o -wholename './_output' \
39+
-o -wholename './_gopath' \
3940
-o -wholename './release' \
4041
-o -wholename './target' \
4142
-o -wholename '*/third_party/*' \

0 commit comments

Comments
 (0)