Update to latest connect-go and makego (#2147)

bufbuild · Jun 1, 2023 · dab6a5b · dab6a5b
1 parent 3825738
commit dab6a5b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/make/go/base.mk b/make/go/base.mk
@@ -178,6 +178,9 @@ postgenerate::
 .PHONY: licensegenerate
 licensegenerate::
 
+.PHONY: format
+format::
+
 .PHONY: generate
 generate: ## Run all generation steps.
 	@$(MAKE) preinstallgenerate
@@ -186,6 +189,7 @@ generate: ## Run all generation steps.
 	@$(MAKE) postprepostgenerate
 	@$(MAKE) postgenerate
 	@$(MAKE) licensegenerate
+	@$(MAKE) format
 
 .PHONY: checknodiffgenerated
 checknodiffgenerated:

diff --git a/make/go/dep_protoc_gen_connect_go.mk b/make/go/dep_protoc_gen_connect_go.mk
@@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 
 # Settable
-# https://github.com/bufbuild/connect-go 20230419 checked 20230420
-CONNECT_VERSION ?= v1.7.0
+# https://github.com/bufbuild/connect-go 20230531 checked 20230601
+CONNECT_VERSION ?= v1.8.0
 
 GO_GET_PKGS := $(GO_GET_PKGS) \
 	github.com/bufbuild/connect-go@$(CONNECT_VERSION)

diff --git a/make/go/go.mk b/make/go/go.mk
@@ -58,6 +58,9 @@ ci:
 	@$(MAKE) lint
 	@$(MAKE) test
 
+.PHONY: postupgradegodeps
+postupgradegodeps::
+
 .PHONY: upgradegodeps
 upgradegodeps:
 	rm -f go.mod go.sum
@@ -68,6 +71,7 @@ ifneq ($(GO_GET_PKGS),)
 endif
 	go get -u -t $(GO_ALL_REPO_PKGS) $(GO_GET_PKGS)
 	go mod tidy -v
+	@$(MAKE) postupgradegodeps
 
 preupgrade:: upgradegodeps
 
@@ -83,7 +87,7 @@ gofmtmodtidy:
 	@gofmt -s -w $(shell find . -name '*.go')
 	go mod tidy -v
 
-postgenerate:: gofmtmodtidy
+format:: gofmtmodtidy
 
 .PHONY: checknonolint
 checknonolint: