From 787ad054ade93eadca825256c932114f7906f6bf Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Tue, 28 Jan 2025 15:52:05 +0200 Subject: [PATCH] Use newer version of golangci-lint Signed-off-by: Furkat Gofurov --- .github/workflows/golangci-lint.yml | 17 +++++++++++------ Makefile | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index bfbb8b1e..b580db80 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -7,16 +7,21 @@ jobs: name: lint runs-on: ubuntu-latest strategy: + fail-fast: false matrix: working-directory: - "" steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2 + - name: Calculate go version + id: vars + run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT + - name: Set up Go + uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0 with: - go-version: '1.23' + go-version: ${{ steps.vars.outputs.go_version }} - name: golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # tag=v6.1.1 with: - version: v1.57.2 - args: --timeout 15m + version: v1.60.2 + args: --timeout 15m diff --git a/Makefile b/Makefile index 4b28a56c..09e83a51 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ CONTROLLER_GEN_VER := v0.16.1 CONTROLLER_GEN_BIN := controller-gen CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER) -GOLANGCI_LINT_VER := v1.57.2 +GOLANGCI_LINT_VER := v1.60.2 GOLANGCI_LINT_BIN := golangci-lint GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)