diff --git a/.github/workflows/golangci.lint.yml b/.github/workflows/golangci.lint.yml index eee98e6..93f312c 100644 --- a/.github/workflows/golangci.lint.yml +++ b/.github/workflows/golangci.lint.yml @@ -23,9 +23,7 @@ jobs: uses: actions/setup-go@v3 with: go-version: 1.22 - - name: Run golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - version: v1.59.1 - args: --timeout=5m -v + - name: Run Lint + run: | + make golanci-lint | make go-lint diff --git a/Makefile b/Makefile index 2177ad3..04d0b43 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ $(ACONFIG_BIN): $(SOURCES) $(GO_ENV_VARS) go build -ldflags="-X 'github.com/aerospike/asconfig/cmd.VERSION=$(VERSION)'" -o $(ACONFIG_BIN) . GOLANGCI_LINT ?= $(GOBIN)/golangci-lint -GOLANGCI_LINT_VERSION ?= v1.59.1 +GOLANGCI_LINT_VERSION ?= v1.60.0 .PHONY: golanci-lint golanci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.