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

chore: update TM dep + go.mod cleanup (backport #175) #196

Merged
merged 3 commits into from
Apr 15, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 15, 2022

This is an automatic backport of pull request #175 done by Mergify.
Cherry-pick of 772e828 has failed:

On branch mergify/bp/v0.45.0x-osmo-v8/pr-175
Your branch is up to date with 'origin/v0.45.0x-osmo-v8'.

You are currently cherry-picking commit 772e82855.
  (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/tm_cmds.go
	modified:   server/util.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   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 772e828)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from alexanderbez as a code owner April 15, 2022 12:11
@mergify mergify bot added the conflicts label Apr 15, 2022
@mergify mergify bot mentioned this pull request Apr 15, 2022
19 tasks
@mergify mergify bot deleted the mergify/bp/v0.45.0x-osmo-v8/pr-175 branch April 15, 2022 12:18
@alexanderbez alexanderbez restored the mergify/bp/v0.45.0x-osmo-v8/pr-175 branch April 15, 2022 12:19
@alexanderbez alexanderbez reopened this Apr 15, 2022
@alexanderbez
Copy link

alexanderbez commented Apr 15, 2022

Replaces #195. The original PR should've been backported to the 0.45.x-v8 branch, I just didn't know that existed.

@ValarDragon can you do a quick sanity check on the updated deps in go.mod please? The only one I'm unsure about is the replaced IAVL one (v5 -> v7).

@alexanderbez
Copy link

@p0mvn does the data race reported by one of the CI runs mean anything to you?

https://github.com/osmosis-labs/cosmos-sdk/runs/6038036518?check_suite_focus=true

Copy link
Member

@ValarDragon ValarDragon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me as well!

@ValarDragon
Copy link
Member

The go race failures are unrelated, we need to get this commit into the v8 branch to fix it: #158

@alexanderbez alexanderbez merged commit d2ca6d1 into v0.45.0x-osmo-v8 Apr 15, 2022
@alexanderbez alexanderbez deleted the mergify/bp/v0.45.0x-osmo-v8/pr-175 branch April 15, 2022 14:51
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