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.

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

fix: update th buf cache to get proto deps #1485

Merged
merged 2 commits into from
Oct 7, 2022
Merged

fix: update th buf cache to get proto deps #1485

merged 2 commits into from
Oct 7, 2022

Conversation

gsk967
Copy link
Collaborator

@gsk967 gsk967 commented Oct 7, 2022

Description

this pr will fix the make proto-gen ,

Note:
we need to update the commit for deps in buf config whenever we bump the cosmos-sdk version

We can get the commits for deps of buf https://github.com/cosmos/cosmos-sdk/blob/v0.46.2/client/v2/internal/buf.lock


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • added appropriate labels to the PR
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@gsk967 gsk967 requested a review from a team as a code owner October 7, 2022 14:55
Copy link
Member

@robert-zaremba robert-zaremba left a comment

Choose a reason for hiding this comment

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

The import overwrite are due to gogo proto version. Let's update gogo proto , and keep the cosmos-sdk commit from umee/main (af8...)

toteki
toteki previously approved these changes Oct 7, 2022
Copy link
Member

@toteki toteki left a comment

Choose a reason for hiding this comment

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

Confirmed locally that running make proto-all in this branch correctly generates the current proto files seen in main branch with no diff.

@toteki toteki dismissed their stale review October 7, 2022 15:44

Holding off on merge until discussing robert's comment though

@robert-zaremba
Copy link
Member

The import overwrite are due to gogo proto version. Let's update gogo proto , and keep the cosmos-sdk commit from umee/main (af8...)

EDIT: ... af8 is the old one, 8cb30a2c4de74dc9bd8d260b1e75e176 is the correct one

I finished that yesterday in #1408 but it was skipped in reviews.

@robert-zaremba
Copy link
Member

Let's merge both - both have same fix, but each has some side improvement.

@toteki
Copy link
Member

toteki commented Oct 7, 2022

Checking up on the merge conflict - which version to use?

@gsk967
Copy link
Collaborator Author

gsk967 commented Oct 7, 2022

@robert-zaremba should be we use latest commit for googleapis https://buf.build/googleapis/googleapis/commits/main
or this commit 8d7204855ec14631a499bd7393ce1970 for googleapis

@gsk967 gsk967 requested a review from toteki October 7, 2022 16:07
@mergify mergify bot merged commit 6867716 into main Oct 7, 2022
@mergify mergify bot deleted the sai/fix_buf branch October 7, 2022 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants