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

fix: Add MigrationModuleManager to handle migration of upgrade module before other modules (backport #16583) #17398

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2023

This is an automatic backport of pull request #16583 done by Mergify.
Cherry-pick of 0c1f6fc has failed:

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

You are currently cherry-picking commit 0c1f6fc16.
  (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:   runtime/builder.go
	modified:   simapp/app.go
	modified:   x/upgrade/module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   UPGRADING.md
	both modified:   baseapp/baseapp.go
	both modified:   docs/docs/building-modules/01-module-manager.md
	both modified:   docs/docs/core/00-baseapp.md
	both modified:   testutil/mock/types_mock_appmodule.go
	both modified:   types/module/module.go
	both modified:   types/module/module_test.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

… before other modules (#16583)

Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
(cherry picked from commit 0c1f6fc)

# Conflicts:
#	CHANGELOG.md
#	UPGRADING.md
#	baseapp/baseapp.go
#	docs/docs/building-modules/01-module-manager.md
#	docs/docs/core/00-baseapp.md
#	testutil/mock/types_mock_appmodule.go
#	types/module/module.go
#	types/module/module_test.go
@mergify mergify bot requested a review from a team as a code owner August 16, 2023 03:00
@mergify mergify bot added the conflicts label Aug 16, 2023
module, ok := m.Modules[moduleName].(BeginBlockAppModule)
if ok {
module.BeginBlock(ctx, req)
=======
if module, ok := m.Modules[moduleName].(appmodule.HasBeginBlocker); ok {

Check warning

Code scanning / CodeQL

Unreachable statement Warning

This statement is unreachable.
@yihuang
Copy link
Collaborator

yihuang commented Aug 16, 2023

breaking change

@yihuang yihuang closed this Aug 16, 2023
@yihuang yihuang deleted the mergify/bp/release/v0.47.x/pr-16583 branch August 16, 2023 03:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants