From 565239ff2b898e57f29c7fb17f37498b888ba26b Mon Sep 17 00:00:00 2001 From: Steve Ayers Date: Fri, 30 Aug 2024 15:27:17 -0400 Subject: [PATCH] Update go and golangci-lint --- .golangci.yml | 1 + go.mod | 2 +- make/go/dep_golangci_lint.mk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 0930c77..658ff01 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -29,6 +29,7 @@ linters: - cyclop # covered by gocyclo - depguard # newer versions require explicit config to depend on anything outside of the Go stdlib - execinquery # deprecated by author + - exportloopref # deprecated in golangci v1.60.2 - funlen # rely on code review to limit function length - gocognit # dubious "cognitive overhead" quantification - gofumpt # prefer standard gofmt diff --git a/go.mod b/go.mod index e435d37..ef7d2cb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bufbuild/makego -go 1.21 +go 1.22 require ( github.com/stretchr/testify v1.9.0 diff --git a/make/go/dep_golangci_lint.mk b/make/go/dep_golangci_lint.mk index 0d33584..5a6a11e 100644 --- a/make/go/dep_golangci_lint.mk +++ b/make/go/dep_golangci_lint.mk @@ -12,9 +12,9 @@ $(call _assert_var,CACHE_BIN) GOLANGCI_LINT_GO_VERSION := $(shell go mod edit -json | jq -r .Go | cut -d'.' -f1-2) # Settable -# https://github.com/golangci/golangci-lint/releases 20240813 checked 20240815 +# https://github.com/golangci/golangci-lint/releases 20240822 checked 20240830 # Contrast golangci-lint configuration with the one in https://github.com/connectrpc/connect-go/blob/main/.golangci.yml when upgrading -GOLANGCI_LINT_VERSION ?= v1.60.1 +GOLANGCI_LINT_VERSION ?= v1.60.3 GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)-go$(GOLANGCI_LINT_GO_VERSION) $(GOLANGCI_LINT):