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: use appmodule.AppModule in integration helpers (backport #16755) #16756

Merged
merged 1 commit into from
Jun 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2023

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

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

You are currently cherry-picking commit f8c8de461.
  (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:   docs/docs/building-modules/16-testing.md
	modified:   tests/integration/bank/keeper/deterministic_test.go
	modified:   types/module/core_module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/integration/distribution/keeper/msg_server_test.go
	both modified:   tests/integration/evidence/keeper/infraction_test.go
	both modified:   tests/integration/gov/keeper/keeper_test.go
	both modified:   tests/integration/slashing/keeper/keeper_test.go
	both modified:   tests/integration/staking/keeper/common_test.go
	both modified:   tests/integration/staking/keeper/determinstic_test.go
	both modified:   testutil/integration/example_test.go
	both modified:   testutil/integration/router.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 June 29, 2023 08:19
@mergify mergify bot added the conflicts label Jun 29, 2023
@github-prbot github-prbot requested review from a team, JeancarloBarrios and atheeshp and removed request for a team June 29, 2023 08:19
@julienrbrt
Copy link
Member

We should backport 6afece6 in v0.50 branch because these conflicts are only import conflicts.

@julienrbrt julienrbrt mentioned this pull request Jun 29, 2023
19 tasks
@julienrbrt
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jun 29, 2023

rebase

❌ Unable to rebase: user julienrbrt is unknown.

Please make sure julienrbrt has logged in Mergify dashboard.

@julienrbrt julienrbrt closed this Jun 29, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16755 branch June 29, 2023 09:48
@julienrbrt julienrbrt restored the mergify/bp/release/v0.50.x/pr-16755 branch June 29, 2023 09:50
@julienrbrt julienrbrt reopened this Jun 29, 2023
@julienrbrt
Copy link
Member

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Jun 29, 2023

update

❌ Base branch update has failed

merge conflict between base and head
err-code: 89893

@github-prbot github-prbot requested a review from a team June 29, 2023 09:51
@julienrbrt
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jun 29, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging tests/integration/bank/keeper/deterministic_test.go
Auto-merging tests/integration/distribution/keeper/msg_server_test.go
CONFLICT (content): Merge conflict in tests/integration/distribution/keeper/msg_server_test.go
Auto-merging tests/integration/evidence/keeper/infraction_test.go
CONFLICT (content): Merge conflict in tests/integration/evidence/keeper/infraction_test.go
Auto-merging tests/integration/gov/keeper/keeper_test.go
CONFLICT (content): Merge conflict in tests/integration/gov/keeper/keeper_test.go
Auto-merging tests/integration/slashing/keeper/keeper_test.go
CONFLICT (content): Merge conflict in tests/integration/slashing/keeper/keeper_test.go
Auto-merging tests/integration/staking/keeper/common_test.go
CONFLICT (content): Merge conflict in tests/integration/staking/keeper/common_test.go
Auto-merging tests/integration/staking/keeper/determinstic_test.go
CONFLICT (content): Merge conflict in tests/integration/staking/keeper/determinstic_test.go
Auto-merging testutil/integration/example_test.go
CONFLICT (content): Merge conflict in testutil/integration/example_test.go
Auto-merging testutil/integration/router.go
CONFLICT (content): Merge conflict in testutil/integration/router.go
Auto-merging types/module/core_module.go
error: could not apply 79fd50ed5... refactor: use appmodule.AppModule in integration helpers (#16755)
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 79fd50ed5... refactor: use appmodule.AppModule in integration helpers (#16755)

err-code: E6277

@julienrbrt
Copy link
Member

julienrbrt commented Jun 29, 2023

I guess I'll need to do it manually still!

@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.50.x/pr-16755 branch from 79fd50e to 6921db3 Compare June 29, 2023 09:54
@julienrbrt julienrbrt enabled auto-merge (squash) June 29, 2023 09:54
@julienrbrt julienrbrt merged commit d805e63 into release/v0.50.x Jun 29, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16755 branch June 29, 2023 11:01
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants