From 9a07b7defe90f66d65b91a374acabaa829d77d11 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 29 Mar 2023 10:36:50 +0700 Subject: [PATCH] fix: use a script to lint each module (#15590) --- .github/workflows/lint.yml | 7 ++----- Makefile | 14 ++------------ scripts/go-lint-all.sh | 11 +++++++++++ 3 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 scripts/go-lint-all.sh diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 52a97f3413f1..413125a8aaa3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,8 +18,5 @@ jobs: with: go-version: 1.20.2 - uses: actions/checkout@v3 - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.51.2 + - run: make lint + diff --git a/Makefile b/Makefile index 523b3d938fb7..8c9bbfd5031e 100644 --- a/Makefile +++ b/Makefile @@ -379,19 +379,9 @@ golangci_version=v1.51.2 lint: @echo "--> Running linter" @go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version) - @$(golangci_lint_cmd) run --timeout=10m + @sh ./scripts/go-lint-all.sh -lint-fix: - @echo "--> Running linter" - @go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version) - @$(golangci_lint_cmd) run --fix --out-format=tab --issues-exit-code=0 - -.PHONY: lint lint-fix - -format: - @go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version) - $(golangci_lint_cmd) run --fix -.PHONY: format +.PHONY: lint ############################################################################### ### Protobuf ### diff --git a/scripts/go-lint-all.sh b/scripts/go-lint-all.sh new file mode 100644 index 000000000000..2f945db92592 --- /dev/null +++ b/scripts/go-lint-all.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -eu + +export pwd=$(pwd) + +for modfile in $(find . -name go.mod); do + echo "linting $(dirname $modfile)" + DIR=$(dirname $modfile) + (cd $DIR; golangci-lint run ./... --fix -c $pwd/.golangci.yml) +done