Skip to content

Commit 7e874af

Browse files
committed
restore GOLANGCI_LINT_VER
Signed-off-by: sivchari <[email protected]>
1 parent 8025ba2 commit 7e874af

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Diff for: .github/workflows/pr-golangci-lint.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ jobs:
2727
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # tag=v5.4.0
2828
with:
2929
go-version: ${{ steps.vars.outputs.go_version }}
30-
- name: Lint Codebase
31-
run: make lint
30+
- name: golangci-lint
31+
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # tag=v7.0.0
32+
with:
33+
version: v2.0.2
34+
working-directory: ${{matrix.working-directory}}
3235
- name: Lint API
3336
run: make lint-api

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER))
160160
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
161161

162162
GOLANGCI_LINT_BIN := golangci-lint
163-
GOLANGCI_LINT_VER := v2.0.2
163+
GOLANGCI_LINT_VER := $(shell cat .github/workflows/pr-golangci-lint.yaml | grep [[:space:]]version: | sed 's/.*version: //')
164164
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
165165
GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/v2/cmd/golangci-lint
166166

0 commit comments

Comments
 (0)