fix make lint bug

openyurtio · Dec 28, 2021 · 2239bf1 · 2239bf1
1 parent 4455011
commit 2239bf1
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -82,9 +82,9 @@ install-golint: ## check golint if not exist install golint tools
 ifeq (, $(shell which golangci-lint))
 	@{ \
 	set -e ;\
-	o install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0 ;\
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0 ;\
 	}
-GOLINT_BIN=$(GOBIN)/golangci-lint
+GOLINT_BIN=$(shell go env GOPATH)/bin/golangci-lint
 else
 GOLINT_BIN=$(shell which golangci-lint)
 endif

diff --git a/hack/make-rules/check_license.sh b/hack/make-rules/check_license.sh
@@ -23,7 +23,7 @@ set -u
 
 licRes=$(
     find . -type f -regex '.*\.go\|.*\.sh' ! -path '*/vendor/*' -exec \
-         sh -c 'head -n4 $1 | grep -Eq "(Copyright|generated|GENERATED)" || echo -e  $1' {} {} \;
+         sh -c 'head -n5 $1 | grep -Eq "(Copyright|generated|GENERATED)" || echo -e  $1' {} {} \;
 )
 
 if [ -n "${licRes}" ]; then

diff --git a/pkg/util/iptables/iptables_linux.go b/pkg/util/iptables/iptables_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/pkg/util/iptables/iptables_test.go b/pkg/util/iptables/iptables_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/pkg/util/iptables/iptables_unsupported.go b/pkg/util/iptables/iptables_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/pkg/util/iptables/monitor_test.go b/pkg/util/iptables/monitor_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/pkg/yurthub/network/dummyif_test.go b/pkg/yurthub/network/dummyif_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/pkg/yurthub/network/dummyif_unsupported.go b/pkg/yurthub/network/dummyif_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*