diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7288be9a0d69..f96de0d358ad 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -13,9 +13,12 @@ jobs: - test - hack/tools steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: 1.17 - name: golangci-lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v3.1.0 with: version: v1.43.0 working-directory: ${{matrix.working-directory}} diff --git a/Makefile b/Makefile index 63a7a96d95e1..1711e6e04c46 100644 --- a/Makefile +++ b/Makefile @@ -757,4 +757,4 @@ $(KUSTOMIZE): # Download kustomize using hack script into tools folder. $(GOLANGCI_LINT): .github/workflows/golangci-lint.yml # Download golanci-lint using hack script into tools folder. hack/ensure-golangci-lint.sh \ -b $(TOOLS_DIR)/$(BIN_DIR) \ - $(shell cat .github/workflows/golangci-lint.yml | grep version | sed 's/.*version: //') + $(shell cat .github/workflows/golangci-lint.yml | grep [[:space:]]version | sed 's/.*version: //')