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

fix(reflection): Fix gogoproto import paths #14838

Merged
merged 6 commits into from
Jan 31, 2023
Merged

fix(reflection): Fix gogoproto import paths #14838

merged 6 commits into from
Jan 31, 2023
+30 −105

Conversation

amaury1093
Copy link
Contributor

@amaury1093 amaury1093 commented Jan 30, 2023 •
edited
Loading

Description

Closes: #14713

Depends on:

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
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • 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 ! in the type prefix if API or client breaking change
  • 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)

julienrbrt
julienrbrt approved these changes Jan 30, 2023
View reviewed changes
Copy link
Member

@julienrbrt julienrbrt left a comment •
edited
Loading

Choose a reason for hiding this comment

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

tACK with hubl.
cosmos/gogoproto should as well be bumped in this PR.

@julienrbrt julienrbrt added R:Twilight backport/v0.47.x PR scheduled for inclusion in the v0.47's next stable release labels Jan 30, 2023
@github-actions github-actions bot added C:CLI C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Hubl Tool: Hubl C:orm C:Rosetta Issues and PR related to Rosetta C:Store C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/tx C:x/upgrade labels Jan 30, 2023
@amaury1093 amaury1093 marked this pull request as ready for review January 30, 2023 20:12
@amaury1093 amaury1093 requested a review from a team as a code owner January 30, 2023 20:12
julienrbrt
julienrbrt approved these changes Jan 30, 2023
View reviewed changes
tools/confix/go.mod Outdated
@@ -35,7 +35,7 @@ require (
github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/gogoproto v1.4.3 // indirect
github.com/cosmos/gogoproto v1.4.4 // indirect
Copy link
Member

Choose a reason for hiding this comment

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

https://github.com/cosmos/cosmos-sdk/actions/runs/4047744533/jobs/6962151076
I think our script go mod update all is fundamentally broken, as it updates all the dependencies, regardless if they are actually needed or not.
Here, for instance, we use 0.47-rc1 so it should not have updated this to v1.4.4 (as there is no reason to)

Copy link
Contributor Author

@amaury1093 amaury1093 Jan 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Do you have a recommendation for this PR? Bumping all to v1.4.4 seems to break some tests (like confix).

I reverted all of the bumps, then only bumped to v1.4.4 the ones that don't depend on cosmos-sdk@v.047-rc1 (e.g. root, store, api), then ./scripts/go-mod-tidy-all. And committed the result.

In any case, the cleanest way might be to tag rc2 after this PR, and bump every remaining module to rc2+v1.4.4

Copy link
Member

Choose a reason for hiding this comment

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

Yes, makes sense. Before rc2, I think we need to, though: #14818

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good, I'll let you decide when's the best time to tag rc2

@julienrbrt julienrbrt mentioned this pull request Jan 30, 2023
Closed
@github-actions github-actions bot removed C:Rosetta Issues and PR related to Rosetta C:Hubl Tool: Hubl labels Jan 31, 2023
@github-actions github-actions bot removed C:x/tx C:orm C:Cosmovisor Issues and PR related to Cosmovisor C:Confix Issues and PR related to Confix C:CLI labels Jan 31, 2023
@amaury1093 amaury1093 enabled auto-merge (squash) January 31, 2023 11:07
@amaury1093 amaury1093 merged commit d0a5bd1 into main Jan 31, 2023
@amaury1093 amaury1093 deleted the am/14713-fix-invalid-fds branch January 31, 2023 11:12
@mergify mergify bot mentioned this pull request Jan 31, 2023
Merged
mergify bot pushed a commit that referenced this pull request Jan 31, 2023
@amaury1093 @mergify
fix(reflection): Fix gogoproto import paths (#14838)
2d963d5 
(cherry picked from commit d0a5bd1)

# Conflicts:
#	api/go.mod
#	api/go.sum
#	go.mod
#	store/go.mod
#	store/go.sum
#	tests/go.mod
#	x/circuit/go.mod
#	x/circuit/go.sum
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/feegrant/go.mod
#	x/feegrant/go.sum
#	x/nft/go.mod
#	x/nft/go.sum
#	x/upgrade/go.mod
#	x/upgrade/go.sum
julienrbrt pushed a commit that referenced this pull request Jan 31, 2023
@mergify @amaury1093
fix(reflection): Fix gogoproto import paths (backport #14838) (#14851)
16dd736 
Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
tsenart pushed a commit to meka-dev/cosmos-sdk that referenced this pull request Apr 12, 2023
@amaury1093 @tsenart
fix(reflection): Fix gogoproto import paths (cosmos#14838)
9001e5d
larry0x pushed a commit to larry0x/cosmos-sdk that referenced this pull request May 22, 2023
@amaury1093
fix(reflection): Fix gogoproto import paths (cosmos#14838)
306c7ac
@tkxkd0159 tkxkd0159 mentioned this pull request Nov 2, 2023
Open
8 tasks
@0xstepit 0xstepit mentioned this pull request Jul 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt approved these changes

@likhita-809 likhita-809 likhita-809 approved these changes

@aaronc aaronc Awaiting requested review from aaronc

@atheeshp atheeshp Awaiting requested review from atheeshp

@testinginprod testinginprod Awaiting requested review from testinginprod

Assignees
No one assigned
Labels
backport/v0.47.x PR scheduled for inclusion in the v0.47's next stable release C:Store C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/upgrade
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Invalid FileDescriptorSet in 0.47
3 participants
@amaury1093 @julienrbrt @likhita-809