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

osmocli: parse Use field's arguments dynamically from a message (backport #6005) #6240

Merged
merged 2 commits into from
Aug 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2023

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

On branch mergify/bp/v18.x/pr-6005
Your branch is up to date with 'origin/v18.x'.

You are currently cherry-picking commit c9cbb9cb.
  (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:   osmoutils/osmocli/dynamic.go
	new file:   osmoutils/osmocli/dynamic_test.go
	modified:   osmoutils/osmocli/query_cmd_wrap.go
	modified:   osmoutils/osmocli/tx_cmd_wrap.go
	modified:   x/concentrated-liquidity/client/cli/query.go
	modified:   x/concentrated-liquidity/client/cli/tx.go
	modified:   x/cosmwasmpool/client/cli/query.go
	modified:   x/cosmwasmpool/client/cli/tx.go
	modified:   x/gamm/client/cli/query.go
	modified:   x/gamm/client/cli/tx.go
	modified:   x/gamm/pool-models/stableswap/util_test.go
	modified:   x/ibc-hooks/client/cli/query.go
	modified:   x/incentives/client/cli/cli_test.go
	modified:   x/incentives/client/cli/query.go
	modified:   x/incentives/client/cli/tx.go
	modified:   x/lockup/client/cli/query.go
	modified:   x/lockup/client/cli/tx.go
	modified:   x/pool-incentives/client/cli/query.go
	modified:   x/poolmanager/client/cli/query.go
	modified:   x/poolmanager/client/cli/tx.go
	modified:   x/protorev/client/cli/query.go
	modified:   x/protorev/client/cli/tx.go
	modified:   x/superfluid/client/cli/query.go
	modified:   x/superfluid/client/cli/tx.go
	modified:   x/tokenfactory/client/cli/query.go
	modified:   x/tokenfactory/client/cli/tx.go
	modified:   x/valset-pref/client/cli/query.go
	modified:   x/valset-pref/client/cli/tx.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum

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

@p0mvn
Copy link
Member

p0mvn commented Aug 30, 2023

devbot fix

@p0mvn p0mvn force-pushed the mergify/bp/v18.x/pr-6005 branch from c7f21f1 to 2926b97 Compare August 30, 2023 20:18
@p0mvn p0mvn merged commit 965a751 into v18.x Aug 30, 2023
@p0mvn p0mvn deleted the mergify/bp/v18.x/pr-6005 branch August 30, 2023 21:10
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.

2 participants