Skip to content

Commit d12841d

Browse files
authored
make check upgrades (knative#3312)
1 parent cfb601e commit d12841d

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.gitattributes

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
testdata/repository-a.git/objects/*/* ignore-lint=true
2-
testdata/repository.git/objects/*/* ignore-lint=true
1+
**/testdata/repository-a.git/objects/*/* ignore-lint=true
2+
**/testdata/repository.git/objects/*/* ignore-lint=true
33
templates/node/*/package-lock.json ignore-lint=true
44
templates/typescript/*/package-lock.json ignore-lint=true
5-
version.txt linguist-generated=true
65
zz_filesystem_generated.go linguist-generated=true
7-
docker/zz_close_guarding_client_generated.go linguist-generated=true
6+
pkg/docker/zz_close_guarding_client_generated.go linguist-generated=true
87
pkg/oci/testdata/test-links/* ignore-lint=true
98

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ check-whitespace: ## Check for trailing whitespace
115115
grep -Ev '(vendor/|third_party/|\.git)' | \
116116
grep -v '\.svg$$' | \
117117
while IFS= read -r file; do [ -f "$$file" ] && echo "$$file"; done | \
118-
xargs grep -nE " +$$" 2>&1 | grep -v "Binary file" && \
118+
xargs grep -nE " +$$" 2>&1 | grep -vi "binary file" && \
119119
(echo "Error: Trailing whitespace found"; exit 1) || true
120120

121121
.PHONY: check-eof
@@ -125,7 +125,7 @@ check-eof: ## Check files end with newlines
125125
git check-attr --stdin linguist-generated | grep -Ev ': (set|true)$$' | cut -d: -f1 | \
126126
git check-attr --stdin linguist-vendored | grep -Ev ': (set|true)$$' | cut -d: -f1 | \
127127
grep -Ev '(vendor/|third_party/|\.git)' | \
128-
grep -Ev '\.(ai|svg)$$' | \
128+
grep -Ev '\.(ai|svg|tar|tgz|zip)$$' | \
129129
while IFS= read -r file; do \
130130
if [ -f "$$file" ] && [ -n "$$(tail -c 1 "$$file" 2>/dev/null)" ]; then \
131131
echo "$$file: missing newline at EOF"; \

0 commit comments

Comments
 (0)