Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to latest connect-go and makego #2147

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Update to latest connect-go and makego #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions make/go/base.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ postgenerate::
.PHONY: licensegenerate
licensegenerate::

.PHONY: format
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't followed upstream changes, but I assume there were some changes..

Copy link
Member Author

@pkwarren pkwarren Jun 1, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep - these were upstream changes to makego to optimize CI build time and also support Knit. These were all updated with make copyfrommakego target.

format::

.PHONY: generate
generate: ## Run all generation steps.
@$(MAKE) preinstallgenerate
Expand All @@ -186,6 +189,7 @@ generate: ## Run all generation steps.
@$(MAKE) postprepostgenerate
@$(MAKE) postgenerate
@$(MAKE) licensegenerate
@$(MAKE) format

.PHONY: checknodiffgenerated
checknodiffgenerated:
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_protoc_gen_connect_go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion make/go/go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ ci:
@$(MAKE) lint
@$(MAKE) test

.PHONY: postupgradegodeps
postupgradegodeps::

.PHONY: upgradegodeps
upgradegodeps:
rm -f go.mod go.sum
Expand All @@ -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

Expand All @@ -83,7 +87,7 @@ gofmtmodtidy:
@gofmt -s -w $(shell find . -name '*.go')
go mod tidy -v

postgenerate:: gofmtmodtidy
format:: gofmtmodtidy

.PHONY: checknonolint
checknonolint:
Expand Down