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

refactor(simapp): re-wire autocli with latest client/v2 changes (backport #4843) #5070

Merged
merged 3 commits into from
Nov 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 9, 2023

This is an automatic backport of pull request #4843 done by Mergify.
Cherry-pick of 016443d has failed:

On branch mergify/bp/release/v8.0.x/pr-4843
Your branch is up to date with 'origin/release/v8.0.x'.

You are currently cherry-picking commit 016443d7.
  (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:   testing/simapp/app.go
	modified:   testing/simapp/simd/cmd/root.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   modules/apps/callbacks/go.mod
	both modified:   modules/apps/callbacks/go.sum
	both modified:   modules/capability/go.mod

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

* refactor: wire autocli

* go mod tidy all + fix textual

(cherry picked from commit 016443d)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
#	modules/capability/go.mod
@@ -4,7 +4,7 @@ module github.com/cosmos/ibc-go/v8

require (
cosmossdk.io/api v0.7.2
cosmossdk.io/client/v2 v2.0.0-20230818115413-c402c51a1508
cosmossdk.io/client/v2 v2.0.0-20231026141021-0469fc17e158
Copy link
Contributor

Choose a reason for hiding this comment

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

will be bumped by #5069

@colin-axner colin-axner removed their assignment Nov 9, 2023
@colin-axner colin-axner added priority PRs that need prompt reviews and removed conflicts labels Nov 9, 2023
Copy link
Contributor

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

Nice catch! This is to resolve the failing test about the file resolver?

@colin-axner
Copy link
Contributor

Nice catch! This is to resolve the failing test about the file resolver?

yup! Looks like it needed this fix for some reason

@colin-axner colin-axner merged commit e8e22c9 into release/v8.0.x Nov 9, 2023
18 checks passed
@colin-axner colin-axner deleted the mergify/bp/release/v8.0.x/pr-4843 branch November 9, 2023 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority PRs that need prompt reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants