From 17576cf031c3aacff678f7f3ced80de33892ace1 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Thu, 16 Nov 2023 13:49:25 +0000 Subject: [PATCH] get golangci-lint's version from tools/mod for the Makefile target install-golangci-lint Signed-off-by: Benjamin Wang --- .github/workflows/static-analysis.yaml | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 6e3ddcfc781..8a762f5ac79 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -12,12 +12,12 @@ jobs: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: go-version: ${{ steps.goversion.outputs.goversion }} - - id: golangci-lint-version - run: echo "golangci-lint-version=$(cd tools/mod && go list -m -f {{.Version}} github.com/golangci/golangci-lint)" >> "$GITHUB_OUTPUT" + - id: golangci_lint_version + run: echo "golangci_lint_version=$(cd tools/mod && go list -m -f {{.Version}} github.com/golangci/golangci-lint)" >> "$GITHUB_OUTPUT" - name: golangci-lint uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0 with: - version: ${{ steps.golangci-lint-version.outputs.golangci-lint-version }} + version: ${{ steps.golangci_lint_version.outputs.golangci_lint_version }} args: --config tools/.golangci.yaml - name: protoc uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1.3.0 diff --git a/Makefile b/Makefile index fcaa935f6b5..939fdaa1480 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ endif # Tools -GOLANGCI_LINT_VERSION = "v1.55.2" +GOLANGCI_LINT_VERSION = $(shell cd tools/mod && go list -m -f {{.Version}} github.com/golangci/golangci-lint) .PHONY: install-golangci-lint install-golangci-lint: