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(client,simapp): inject keyring in autocli opts (backport #17351) #17382

Merged
merged 2 commits into from
Aug 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 14, 2023

This is an automatic backport of pull request #17351 done by Mergify.
Cherry-pick of bf92632 has failed:

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

You are currently cherry-picking commit bf92632a0.
  (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:   CHANGELOG.md
	modified:   UPGRADING.md
	modified:   client/v2/README.md
	modified:   client/v2/autocli/flag/address.go
	modified:   client/v2/autocli/flag/builder.go
	modified:   client/v2/autocli/keyring/interface.go
	modified:   client/v2/autocli/keyring/no_keyring.go
	modified:   client/v2/autocli/query_test.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:   crypto/keyring/keyring.go
	modified:   docs/.gitignore
	modified:   docs/docs/building-modules/01-intro.md
	modified:   docs/docs/building-modules/09-module-interfaces.md
	modified:   docs/docs/building-modules/11-structure.md
	modified:   docs/docs/core/07-cli.md
	modified:   docs/docs/packages/README.md
	modified:   docs/docusaurus.config.js
	modified:   docs/post.sh
	modified:   docs/pre.sh
	modified:   simapp/simd/cmd/root.go
	modified:   simapp/simd/cmd/root_v2.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   client/config/config.go
	deleted by them: docs/docs/building-modules/10-autocli.md

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 bf92632)

# Conflicts:
#	client/config/config.go
#	docs/docs/building-modules/10-autocli.md
@mergify mergify bot requested review from julienrbrt, tac0turtle and a team as code owners August 14, 2023 14:12
@mergify mergify bot added the conflicts label Aug 14, 2023
@julienrbrt julienrbrt self-assigned this Aug 14, 2023
@github-actions github-actions bot added the C:CLI label Aug 14, 2023
@github-prbot github-prbot requested a review from a team August 14, 2023 14:16
@julienrbrt julienrbrt enabled auto-merge (squash) August 14, 2023 14:38
@julienrbrt julienrbrt merged commit 7407866 into release/v0.50.x Aug 14, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17351 branch August 14, 2023 14:44
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant