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

deps: bump Cosmos SDK to tip of release/v0.50.x (backport #4976) #4987

Merged
merged 2 commits into from
Oct 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2023

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

On branch mergify/bp/release/v8.0.x/pr-4976
Your branch is up to date with 'origin/release/v8.0.x'.

You are currently cherry-picking commit f6594f61.
  (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:   modules/apps/callbacks/testing/simapp/app.go
	modified:   modules/light-clients/06-solomachine/module.go
	modified:   modules/light-clients/07-tendermint/module.go
	modified:   testing/mock/mock.go
	modified:   testing/simapp/app.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e/go.mod
	both modified:   e2e/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   modules/apps/callbacks/go.mod
	both modified:   modules/apps/callbacks/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

* deps: bump to Cosmos SDK @ 0469fc17e1587850e7de390af282df5215287a21

* lint

* Apply suggestions from code review

Co-authored-by: srdtrk <[email protected]>

---------

Co-authored-by: srdtrk <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit f6594f6)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
@damiannolan
Copy link
Member

Thanks for handling conflicts @crodriguezvega :)

@crodriguezvega crodriguezvega merged commit 4ab7752 into release/v8.0.x Oct 30, 2023
56 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v8.0.x/pr-4976 branch October 30, 2023 14:25
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