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

feat(baseapp): Add Hybrid Protobuf handlers to MsgServiceRouter (backport #18071) #18338

Merged
merged 9 commits into from
Nov 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 2, 2023

This is an automatic backport of pull request #18071 done by Mergify.
Cherry-pick of 5edabb5 has failed:

On branch mergify/bp/release/v0.50.x/pr-18071
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 5edabb5cb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   baseapp/msg_service_router_test.go
	modified:   server/mock/app.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   baseapp/grpcrouter.go
	both modified:   baseapp/grpcrouter_test.go
	deleted by us:   baseapp/internal/protocompat/protocompat.go
	both modified:   baseapp/msg_service_router.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: unknown unknown <unknown@unknown>
(cherry picked from commit 5edabb5)

# Conflicts:
#	CHANGELOG.md
#	baseapp/grpcrouter.go
#	baseapp/grpcrouter_test.go
#	baseapp/internal/protocompat/protocompat.go
#	baseapp/msg_service_router.go
@mergify mergify bot requested a review from a team as a code owner November 2, 2023 14:34
@mergify mergify bot added the conflicts label Nov 2, 2023
Copy link
Contributor

coderabbitai bot commented Nov 2, 2023

Important

Auto Review Skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.


Tips

Chat with CodeRabbit Bot (@coderabbitai)

  • If you reply to a review comment from CodeRabbit, the bot will automatically respond.
  • To engage with CodeRabbit bot directly around the specific lines of code in the PR, mention @coderabbitai in your review comment
  • Note: Review comments are made on code diffs or files, not on the PR overview.
  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai help to get help.
  • @coderabbitai resolve to resolve all the CodeRabbit review comments.

Note: For conversation with the bot, please use the review comments on code diffs or files.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.json

@github-prbot github-prbot requested review from a team, facundomedica and testinginprod and removed request for a team November 2, 2023 14:34
@testinginprod
Copy link
Contributor

@Mergifyio refresh

Copy link
Contributor Author

mergify bot commented Nov 2, 2023

refresh

✅ Pull request refreshed

@testinginprod
Copy link
Contributor

@Mergifyio update

Copy link
Contributor Author

mergify bot commented Nov 2, 2023

update

❌ Base branch update has failed

merge conflict between base and head

unknown unknown added 4 commits November 2, 2023 17:55
…/release/v0.50.x/pr-18071

# Conflicts:
#	baseapp/grpcrouter.go
#	baseapp/grpcrouter_test.go
#	baseapp/internal/protocompat/protocompat.go
@testinginprod testinginprod enabled auto-merge (squash) November 2, 2023 17:32
@julienrbrt julienrbrt requested a review from a team November 2, 2023 17:36
@julienrbrt julienrbrt disabled auto-merge November 2, 2023 19:19
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

utACK

@julienrbrt julienrbrt enabled auto-merge (squash) November 3, 2023 11:02
@julienrbrt julienrbrt merged commit 7843204 into release/v0.50.x Nov 3, 2023
44 of 46 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18071 branch November 3, 2023 11:08
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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.

2 participants