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: move UpgradeModule interface to appmodule and fix mocks (backport #17383) #17409

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 #17383 done by Mergify.
Cherry-pick of e3a3df2 has failed:

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

You are currently cherry-picking commit e3a3df2a8.
  (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:   core/appmodule/module.go
	modified:   docs/docs/building-modules/01-module-manager.md
	modified:   testutil/mock/types_mock_appmodule.go
	modified:   types/module/mock_appmodule_test.go
	modified:   types/module/module.go
	modified:   types/module/module_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   core/CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	deleted by us:   simapp/gomod2nix.toml
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	deleted by us:   tests/starship/tests/go.mod
	both modified:   x/evidence/go.mod
	both modified:   x/evidence/go.sum
	both modified:   x/evidence/testutil/expected_keepers_mocks.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

…17383)

Co-authored-by: Marko <[email protected]>
(cherry picked from commit e3a3df2)

# Conflicts:
#	core/CHANGELOG.md
#	go.mod
#	go.sum
#	simapp/go.mod
#	simapp/go.sum
#	simapp/gomod2nix.toml
#	tests/go.mod
#	tests/go.sum
#	tests/starship/tests/go.mod
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/evidence/testutil/expected_keepers_mocks.go
@mergify mergify bot requested a review from a team as a code owner August 16, 2023 14:15
@mergify mergify bot added the conflicts label Aug 16, 2023
@github-prbot github-prbot requested review from a team, kocubinski and testinginprod and removed request for a team August 16, 2023 14:15
@julienrbrt julienrbrt self-assigned this Aug 16, 2023
@julienrbrt julienrbrt merged commit 6a5adc4 into release/v0.50.x Aug 16, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17383 branch August 16, 2023 14:58
@julienrbrt julienrbrt removed their assignment Aug 16, 2023
@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