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: precise compiler assertions and cleanup module.go (backport #17718) #17724

Merged
merged 2 commits into from
Sep 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2023

This is an automatic backport of pull request #17718 done by Mergify.
Cherry-pick of 2154ce0 has failed:

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

You are currently cherry-picking commit 2154ce0bb.
  (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:   UPGRADING.md
	modified:   docs/docs/build/building-modules/06-beginblock-endblock.md
	modified:   testutil/mock/types_module_module.go
	modified:   types/module/mock_appmodule_test.go
	modified:   types/module/module.go
	modified:   x/auth/module.go
	modified:   x/auth/vesting/module.go
	modified:   x/authz/module/module.go
	modified:   x/bank/module.go
	modified:   x/circuit/module.go
	modified:   x/consensus/module.go
	modified:   x/crisis/module.go
	modified:   x/distribution/module.go
	modified:   x/evidence/module.go
	modified:   x/feegrant/module/module.go
	modified:   x/genutil/module.go
	modified:   x/gov/module.go
	modified:   x/group/module/module.go
	modified:   x/mint/module.go
	modified:   x/nft/module/module.go
	modified:   x/params/module.go
	modified:   x/slashing/module.go
	modified:   x/staking/module.go

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

@mergify mergify bot requested a review from a team as a code owner September 13, 2023 16:20
@mergify mergify bot added the conflicts label Sep 13, 2023
@julienrbrt julienrbrt self-assigned this Sep 13, 2023
@julienrbrt
Copy link
Member

Waiting for #17712 (review) to be merged first.

@julienrbrt
Copy link
Member

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Sep 13, 2023

update

❌ Base branch update has failed

merge conflict between base and head

@julienrbrt
Copy link
Member

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Sep 13, 2023

refresh

✅ Pull request refreshed

@mergify
Copy link
Contributor Author

mergify bot commented Sep 13, 2023

update

❌ Base branch update has failed

merge conflict between base and head

@julienrbrt
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Sep 13, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging UPGRADING.md
Auto-merging docs/docs/build/building-modules/01-module-manager.md
CONFLICT (content): Merge conflict in docs/docs/build/building-modules/01-module-manager.md
Auto-merging testutil/mock/types_mock_appmodule.go
CONFLICT (content): Merge conflict in testutil/mock/types_mock_appmodule.go
Auto-merging types/module/module.go
Auto-merging types/module/module_test.go
CONFLICT (content): Merge conflict in types/module/module_test.go
Auto-merging x/upgrade/module.go
error: could not apply f46a987aa... refactor: precise compiler assertions and cleanup module.go (#17718)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f46a987aa... refactor: precise compiler assertions and cleanup module.go (#17718)

@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.50.x/pr-17718 branch from f46a987 to 9b5a203 Compare September 13, 2023 18:51
@julienrbrt julienrbrt removed their assignment Sep 13, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) September 13, 2023 19:07
@julienrbrt julienrbrt merged commit 32969cf into release/v0.50.x Sep 13, 2023
52 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17718 branch September 13, 2023 19:08
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