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 comet fork (backport #8134) #8140

Merged
merged 2 commits into from
Apr 24, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 24, 2024

Closes: #XXX

What is the purpose of the change

Once bumped and backported to v24, will create a v24.0.3 release.

Includes the following changes:

* bump comet fork

* changelog

* go mod tidy

(cherry picked from commit 71f4e19)

# Conflicts:
#	go.mod
#	go.sum
Copy link
Contributor Author

mergify bot commented Apr 24, 2024

Cherry-pick of 71f4e19 has failed:

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

You are currently cherry-picking commit 71f4e195.
  (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.mod
	modified:   x/epochs/go.mod
	modified:   x/ibc-hooks/go.mod

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor

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.

@czarcas7ic czarcas7ic merged commit 9929fae into v24.x Apr 24, 2024
1 check passed
@czarcas7ic czarcas7ic deleted the mergify/bp/v24.x/pr-8134 branch April 24, 2024 20:09
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