chore: Revert "fix: update buf to v1.7.0 and regenerate proto files (#280)" #343
Conversation
This reverts commit 98c7ba6.
| @@ -17,7 +17,6 @@ require ( | |||
| github.com/cosmos/cosmos-proto v1.0.0-alpha7 | |||
| github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1 | |||
| github.com/cosmos/go-bip39 v1.0.0 | |||
| github.com/cosmos/gogoproto v1.4.10 | |||
There was a problem hiding this comment.
👍 upstream doesn't depend on cosmos/gogoproto
| @@ -2,7 +2,7 @@ | |||
| # docker build --pull --rm -f "contrib/devtools/Dockerfile" -t cosmossdk-proto:latest "contrib/devtools" | |||
| # docker run --rm -v $(pwd):/workspace --workdir /workspace cosmossdk-proto sh ./scripts/protocgen.sh | |||
|
|
|||
| FROM bufbuild/buf:1.7.0 as BUILDER | |||
| FROM bufbuild/buf:1.1.0 as BUILDER | |||
There was a problem hiding this comment.
| - remote: buf.build | ||
| owner: cosmos | ||
| repository: cosmos-sdk | ||
| commit: 44369accb517453db1f2228530da42c0 | ||
| branch: main | ||
| commit: 86d2a697b026488089f13a71ceb3815c |
There was a problem hiding this comment.
[note] the commit looks different from upstream https://github.com/cosmos/cosmos-sdk/blob/2a48f6d7a24b728ac64eafe0929bb8893cc23ccf/client/v2/internal/buf.lock#L8-L11
although I'm not if it is necessary for these to match exactly
| - remote: buf.build | ||
| owner: googleapis | ||
| repository: googleapis | ||
| commit: 62f35d8aed1149c291d606d958a7ce32 | ||
| branch: main | ||
| commit: 40f07f5b563941f2b20b991a7aedd53d |
There was a problem hiding this comment.
[note] the commit looks different from upstream: https://github.com/cosmos/cosmos-sdk/blob/2a48f6d7a24b728ac64eafe0929bb8893cc23ccf/client/v2/internal/buf.lock#L16-L19
although I'm not if it is necessary for these to match exactly
| @@ -17,7 +17,7 @@ jobs: | |||
| timeout-minutes: 5 | |||
| steps: | |||
| - uses: actions/checkout@v3 | |||
| - uses: bufbuild/buf-setup-action@v1.8.0 | |||
| - uses: bufbuild/buf-setup-action@v1.4.0 | |||
There was a problem hiding this comment.
| @@ -12,7 +12,7 @@ SIMAPP = ./simapp | |||
| MOCKS_DIR = $(CURDIR)/tests/mocks | |||
| HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git | |||
| DOCKER := $(shell which docker) | |||
| DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.7.0 | |||
| DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8 | |||
There was a problem hiding this comment.
Description
reverts #280 to keep us using the same protogen as upstream. note that we should likely expect the proto CI linter to fail