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: cleanup server logic (backport #15041) #15128

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2023

This is an automatic backport of pull request #15041 done by Mergify.
Cherry-pick of 7f99ad5 has failed:

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

You are currently cherry-picking commit 7f99ad5fe.
  (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:   server/grpc/server.go
	modified:   simapp/go.mod
	modified:   tests/go.mod

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   server/api/server.go
	both modified:   server/start.go
	both modified:   server/types/app.go
	both modified:   server/util.go
	both modified:   simapp/go.sum
	both modified:   tests/go.sum
	both modified:   testutil/network/network.go
	both modified:   testutil/network/util.go
	deleted by us:   tools/confix/go.mod
	deleted by us:   tools/confix/go.sum
	deleted by us:   x/evidence/go.mod
	deleted by us:   x/evidence/go.sum
	deleted by us:   x/feegrant/go.mod
	deleted by us:   x/feegrant/go.sum
	deleted by us:   x/nft/go.mod
	deleted by us:   x/nft/go.sum
	deleted by us:   x/upgrade/go.mod
	deleted by us:   x/upgrade/go.sum

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

(cherry picked from commit 7f99ad5)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	server/api/server.go
#	server/start.go
#	server/types/app.go
#	server/util.go
#	simapp/go.sum
#	tests/go.sum
#	testutil/network/network.go
#	testutil/network/util.go
#	tools/confix/go.mod
#	tools/confix/go.sum
#	x/evidence/go.mod
#	x/evidence/go.sum
#	x/feegrant/go.mod
#	x/feegrant/go.sum
#	x/nft/go.mod
#	x/nft/go.sum
#	x/upgrade/go.mod
#	x/upgrade/go.sum
@tac0turtle
Copy link
Member

lets backport this in 0.47.1, dont want to add anything we havent qa'ed in the current scope. Its not state machine breaking but would be good to test things more throughly

@tac0turtle tac0turtle closed this Feb 22, 2023
@mergify mergify bot deleted the mergify/bp/release/v0.47.x/pr-15041 branch February 22, 2023 19:07
@mergify mergify bot mentioned this pull request Mar 20, 2023
25 tasks
@tac0turtle tac0turtle restored the mergify/bp/release/v0.47.x/pr-15041 branch March 20, 2023 16:29
@tac0turtle
Copy link
Member

@Mergifyio rebase

@tac0turtle tac0turtle reopened this Mar 20, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Mar 20, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
Auto-merging server/util.go
CONFLICT (content): Merge conflict in server/util.go
Auto-merging simapp/go.mod
CONFLICT (content): Merge conflict in simapp/go.mod
Auto-merging simapp/go.sum
Auto-merging tests/go.mod
CONFLICT (content): Merge conflict in tests/go.mod
Auto-merging tests/go.sum
Auto-merging testutil/network/network.go
CONFLICT (content): Merge conflict in testutil/network/network.go
error: could not apply bf060a667... refactor: cleanup server logic (#15041)
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 bf060a667... refactor: cleanup server logic (#15041)

err-code: 071D9

@tac0turtle
Copy link
Member

dont think this is needed since we will be releaseing 0.48 in a few months

@tac0turtle tac0turtle closed this Mar 28, 2023
@mergify mergify bot deleted the mergify/bp/release/v0.47.x/pr-15041 branch March 28, 2023 14:34
@alexanderbez
Copy link
Contributor

It would be nice to have, but yeah not a hard requirement

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.

2 participants