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: use autocli for comet commands (backport #17389) #17405

Merged
merged 4 commits into from
Aug 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2023

This is an automatic backport of pull request #17389 done by Mergify.
Cherry-pick of 208219a has failed:

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

You are currently cherry-picking commit 208219a42.
  (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:
	new file:   client/grpc/cmtservice/autocli.go
	modified:   client/grpc/cmtservice/block.go
	modified:   client/grpc/cmtservice/service.go
	modified:   client/grpc/cmtservice/status.go
	new file:   client/grpc/cmtservice/status_test.go
	modified:   client/rpc/rpc_test.go
	deleted:    client/rpc/status.go
	deleted:    client/rpc/validators.go
	modified:   client/v2/README.md
	new file:   client/v2/autocli/flags.go
	modified:   client/v2/autocli/msg.go
	modified:   client/v2/autocli/query.go
	modified:   client/v2/autocli/testdata/help-deprecated-msg.golden
	modified:   client/v2/autocli/testdata/help-deprecated.golden
	modified:   client/v2/autocli/testdata/help-echo-msg.golden
	modified:   client/v2/autocli/testdata/help-echo.golden
	modified:   runtime/autocli.go
	modified:   server/cmt_cmds.go
	modified:   simapp/simd/cmd/commands.go
	modified:   x/consensus/autocli.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   tools/hubl/go.mod
	both modified:   tools/hubl/go.sum
	both modified:   tools/hubl/internal/remote.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

(cherry picked from commit 208219a)

# Conflicts:
#	CHANGELOG.md
#	tools/hubl/go.mod
#	tools/hubl/go.sum
#	tools/hubl/internal/remote.go
@mergify mergify bot requested a review from a team as a code owner August 16, 2023 10:50
@mergify mergify bot added the conflicts label Aug 16, 2023
@julienrbrt julienrbrt self-assigned this Aug 16, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) August 16, 2023 11:42
@julienrbrt julienrbrt removed their assignment Aug 16, 2023
@github-actions github-actions bot removed the C:Hubl Tool: Hubl label Aug 16, 2023
@julienrbrt julienrbrt merged commit b056224 into release/v0.50.x Aug 16, 2023
46 of 47 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17389 branch August 16, 2023 12:03
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant