From 32039b0ecf86ac428dcb43290a1eb094c05af1b2 Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets Date: Tue, 16 Jul 2024 10:24:40 -0700 Subject: [PATCH] Fix version mismatch Signed-off-by: Arkadii Yakovets --- .github/workflows/main.yml | 3 ++- Makefile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8418ae762..0ca02c32b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,7 +59,8 @@ jobs: - name: Run golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.59 + # The version must match "install-golangci-lint" Makefile target version. + version: v1.59.1 - name: Run govulncheck run: make govulncheck diff --git a/Makefile b/Makefile index 5bacae5f0..c866bc9f7 100644 --- a/Makefile +++ b/Makefile @@ -493,6 +493,7 @@ golangci-lint: install-golangci-lint golangci-lint run install-golangci-lint: + # The version must match GitHub main.yml lint job "Run golangci-lint" step version. which golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.59.1 remove-golangci-lint: