Skip to content

Commit

Permalink
Merge branch 'main' into pkw/verify-nolintlint
Browse files Browse the repository at this point in the history
  • Loading branch information
pkwarren committed Mar 21, 2024
2 parents 79b1422 + 3ad838a commit 9c5b7f5
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
4 changes: 3 additions & 1 deletion .golangci.yml
@@ -1,5 +1,5 @@
run:
skip-dirs-use-default: false
exclude-dirs-use-default: false
linters-settings:
errcheck:
check-type-assertions: true
Expand Down Expand Up @@ -39,12 +39,14 @@ linters:
- golint # deprecated by Go team
- gomnd # some unnamed constants are okay
- ifshort # deprecated by author
- inamedparam # convention is not followed
- interfacer # deprecated by author
- ireturn # "accept interfaces, return structs" isn't ironclad
- lll # don't want hard limits for line length
- maintidx # covered by gocyclo
- maligned # readability trumps efficient struct packing
- nlreturn # generous whitespace violates house style
- nonamedreturns # named returns are fine; it's *bare* returns that are bad
- nosnakecase # deprecated in https://github.com/golangci/golangci-lint/pull/3065
- scopelint # deprecated by author
- structcheck # abandoned
Expand Down
2 changes: 1 addition & 1 deletion make/go/base.mk
Expand Up @@ -220,7 +220,7 @@ upgradenopost:
copyfrommakego:
@rm -rf $(TMP)/makego
@mkdir -p $(TMP)
git clone $(MAKEGO_REMOTE) $(TMP)/makego
git clone --depth 1 $(MAKEGO_REMOTE) $(TMP)/makego
rm -rf $(MAKEGO)
cp -R $(TMP)/makego/make/go $(MAKEGO)
@rm -rf $(TMP)/makego
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_buf.mk
Expand Up @@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/bufbuild/buf/releases 20240124 checked 20240126
BUF_VERSION ?= v1.29.0
# https://github.com/bufbuild/buf/releases 20240307 checked 20240320
BUF_VERSION ?= v1.30.0
# Settable
#
# If set, this path will be installed every time someone depends on $(BUF)
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_golangci_lint.mk
Expand Up @@ -7,9 +7,9 @@ $(call _assert_var,CACHE_VERSIONS)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/golangci/golangci-lint/releases 20240208 checked 20240209
# https://github.com/golangci/golangci-lint/releases 20240320 checked 20240320
# Contrast golangci-lint configuration with the one in https://github.com/connectrpc/connect-go/blob/main/.golangci.yml when upgrading
GOLANGCI_LINT_VERSION ?= v1.56.1
GOLANGCI_LINT_VERSION ?= v1.57.1

GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)
$(GOLANGCI_LINT):
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_protoc.mk
Expand Up @@ -10,9 +10,9 @@ $(call _assert_var,CACHE_INCLUDE)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/protocolbuffers/protobuf/releases 20231101 checked 20231102
# https://github.com/protocolbuffers/protobuf/releases 20240313 checked 20240313
# NOTE: Set to version compatible with genproto source code (only used in tests).
PROTOC_VERSION ?= 25.0
PROTOC_VERSION ?= 26.0

ifeq ($(UNAME_OS),Darwin)
PROTOC_OS := osx
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_protoc_gen_connect_go.mk
Expand Up @@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
$(call _assert_var,CACHE_BIN)

# Settable
# https://github.com/connectrpc/connect-go 20240216 checked 20240216
CONNECT_VERSION ?= v1.15.0
# https://github.com/connectrpc/connect-go 20240320 checked 20240320
CONNECT_VERSION ?= v1.16.0

GO_GET_PKGS := $(GO_GET_PKGS) \
connectrpc.com/connect@$(CONNECT_VERSION)
Expand Down

0 comments on commit 9c5b7f5

Please sign in to comment.