diff options
| -rwxr-xr-x | .github/workflows/run.sh | 1 | ||||
| -rw-r--r-- | Makefile | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/run.sh b/.github/workflows/run.sh index 3f6b00431..47aa102bd 100755 --- a/.github/workflows/run.sh +++ b/.github/workflows/run.sh @@ -8,5 +8,4 @@ set -o pipefail # Run the specified command and convert error messages to github format: # https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message $1 "${@:2}" | \ - sed -E "s#/syzkaller/gopath/src/github.com/google/syzkaller/#\n#g" | \ sed -E 's#\s*([a-zA-Z0-9._/-]+):([0-9]+):(([0-9]+):)? (.+)#\0\n::error file=\1,line=\2,col=0\4::\5#' @@ -289,11 +289,15 @@ tidy: descriptions -extra-arg=-DHOSTGOOS_$(HOSTOS)=1 -extra-arg=-DGIT_REVISION=\"$(REV)\" \ executor/*.cc +ifdef CI + LINT-FLAGS := --out-format github-actions +endif + lint: # This should install the command from our vendor dir. CGO_ENABLED=1 $(HOSTGO) install github.com/golangci/golangci-lint/cmd/golangci-lint CGO_ENABLED=1 $(HOSTGO) build -buildmode=plugin -o bin/syz-linter.so ./tools/syz-linter - bin/golangci-lint run ./... + bin/golangci-lint run $(LINT-FLAGS) ./... presubmit: $(MAKE) presubmit_aux |