Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bug] fix make lint bug #698

Merged
merged 1 commit into from
Dec 28, 2021
Merged

[bug] fix make lint bug #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/make-rules/check_license.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/util/iptables/iptables_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
rambohe-ch marked this conversation as resolved.
Show resolved Hide resolved
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/util/iptables/iptables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/util/iptables/iptables_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/util/iptables/monitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/yurthub/network/dummyif_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions pkg/yurthub/network/dummyif_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

/*
Expand Down