Skip to content

makefile: change buf to use tools.go ; backport v0.34#8852

Merged
jmalicevic merged 3 commits intov0.34.xfrom
jasmina/8850-buf-backport-v0.34
Jun 23, 2022
Merged

makefile: change buf to use tools.go ; backport v0.34#8852
jmalicevic merged 3 commits intov0.34.xfrom
jasmina/8850-buf-backport-v0.34

Conversation

@jmalicevic
Copy link
Contributor

Closes #8850

The CI in 0.34 was failing due to an update to buf.

williambanfield and others added 2 commits June 23, 2022 11:24
This will keep the version of `buf` consistent between all developer machines.
.PHONY: proto-gen

proto-lint:
@$(DOCKER_BUF) check lint --error-format=json
Copy link
Contributor

Choose a reason for hiding this comment

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

Is DOCKER_BUF referenced anywhere else in this makefile? If not, let's delete the variable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is referenced below in check-proto-breaking-ci . However this command does not exist anymore in master. Do you think we should delete both that and the variable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just saw that this exists in 0.35 so I will merge it as is.

Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com>
@jmalicevic jmalicevic merged commit a3cc3d9 into v0.34.x Jun 23, 2022
@jmalicevic jmalicevic deleted the jasmina/8850-buf-backport-v0.34 branch June 23, 2022 14:47
@jmalicevic jmalicevic restored the jasmina/8850-buf-backport-v0.34 branch June 23, 2022 20:47
@jmalicevic
Copy link
Contributor Author

@tychoish, @creachadair , @williambanfield , turns out it is not so straight forward to get this to actually work. I had to introduce a few more changes in the backport PR (#8695 ) to get the bufs to work. Before i repeat this in this branch, can someone please take a look at the changes in Makefile? I am sure there is a better way to install the deps then from the Makefile directly. 0.36 has proto-gen.sh for this, 0.34 does not. Also, should we delete all references to docker when it comes to proto (.github/workflow/proto-docker; scripts/protocgen.sh)?

torao added a commit to Finschia/ostracon that referenced this pull request May 31, 2023
torao added a commit to Finschia/ostracon that referenced this pull request Jun 1, 2023
…608)

* fix so that vektra/mockery/v2 isn't erased by `go mod tidy`

* backport tendermint/tendermint#8852

---------

Co-authored-by: TAKAMI Torao <koiroha@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants