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: bump sdk and cometbft (backport #8743) #8749

Merged
merged 2 commits into from
Oct 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 2, 2024

What is the purpose of the change

Bumping cometbft and cosmos sdk to the lastest versions:

comet => https://github.com/osmosis-labs/cometbft/releases/tag/v0.38.12-v26-osmo-2
cosmossdk => https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.50.10-v26-osmo-2


This is an automatic backport of pull request #8743 done by [Mergify](https://mergify.com).

* chore: bump sdk and cometbft

* chore: add CHANGELOG

* chore: bump sdk and cometbft

(cherry picked from commit 6f64b71)

# Conflicts:
#	go.mod
#	go.sum
#	osmomath/go.mod
#	osmomath/go.sum
#	osmoutils/go.mod
#	x/epochs/go.sum
@mergify mergify bot requested a review from mattverse as a code owner October 2, 2024 17:39
@mergify mergify bot added the conflicts label Oct 2, 2024
@mergify mergify bot requested a review from nicolaslara as a code owner October 2, 2024 17:39
Copy link
Contributor Author

mergify bot commented Oct 2, 2024

Cherry-pick of 6f64b71 has failed:

On branch mergify/bp/v26.x/pr-8743
Your branch is up to date with 'origin/v26.x'.

You are currently cherry-picking commit 6f64b711a.
  (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:   CHANGELOG.md
	modified:   osmoutils/go.sum
	modified:   x/epochs/go.mod
	modified:   x/ibc-hooks/go.mod
	modified:   x/ibc-hooks/go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmomath/go.mod
	both modified:   osmomath/go.sum
	both modified:   osmoutils/go.mod
	both modified:   x/epochs/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor

github-actions bot commented Oct 2, 2024

Important Notice

This PR modifies an in-repo Go module. It is one of:

  • osmomath
  • osmoutils
  • x/ibc-hooks
  • x/epochs

The dependent Go modules, especially the root one, will have to be
updated to reflect the changes. Failing to do so might cause e2e to fail.

Please follow the instructions below:

  1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
  2. Provide the current branch name
  3. On success, confirm if an automated commit corretly updated the go.mod and go.sum files

Please let us know if you need any help.

@PaddyMc PaddyMc merged commit d20b42d into v26.x Oct 2, 2024
21 checks passed
@PaddyMc PaddyMc deleted the mergify/bp/v26.x/pr-8743 branch October 2, 2024 18:10
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