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/v2): Add clientCtx to commands in autocli (backport #17709) #17763

Merged
merged 5 commits into from
Sep 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 15, 2023

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

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

You are currently cherry-picking commit a0bd4e9fb.
  (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:   client/v2/autocli/app.go
	modified:   client/v2/autocli/builder.go
	modified:   client/v2/autocli/common_test.go
	modified:   client/v2/autocli/flag/address.go
	modified:   client/v2/autocli/flag/builder.go
	modified:   client/v2/autocli/msg.go
	modified:   client/v2/autocli/msg_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum
	both modified:   simapp/simd/cmd/root.go
	both modified:   simapp/simd/cmd/root_v2.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: Julien Robert <julien@rbrt.fr>
(cherry picked from commit a0bd4e9)

# Conflicts:
#	client/v2/go.mod
#	client/v2/go.sum
#	simapp/simd/cmd/root.go
#	simapp/simd/cmd/root_v2.go
@mergify mergify bot requested a review from a team as a code owner September 15, 2023 12:31
@mergify mergify bot added the conflicts label Sep 15, 2023
@github-prbot github-prbot requested review from a team, alexanderbez and julienrbrt and removed request for a team September 15, 2023 12:31
@github-actions github-actions bot added the C:CLI label Sep 15, 2023
@github-actions

This comment has been minimized.

@julienrbrt
Copy link
Member

This is the first PR where in a standalone go.mod the backport differs significantly from the original.
This is because #17503 was not backported and will be included in v0.51 only.
This means we need to keep the address codecs in autocli config.

@julienrbrt julienrbrt requested a review from atheeshp September 15, 2023 13:10
@julienrbrt julienrbrt merged commit 245e218 into release/v0.50.x Sep 15, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17709 branch September 15, 2023 15:36
@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.

2 participants