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 osmoutils to fix indexer config (v25.x) (backport #8446) #8448

Merged
merged 3 commits into from
Jun 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 26, 2024

Closes: #XXX

What is the purpose of the change

This fix did not update the osmoutil dependency:
#8431

This PR fixes it so that the config is picked up correctly.

Upon backporting, I will retag to v25.x branch.


This is an automatic backport of pull request #8446 done by Mergify.

@mergify mergify bot requested a review from mattverse as a code owner June 26, 2024 01:23
@mergify mergify bot added the conflicts label Jun 26, 2024
@mergify mergify bot requested a review from nicolaslara as a code owner June 26, 2024 01:23
Copy link
Contributor Author

mergify bot commented Jun 26, 2024

Cherry-pick of ebbcfab has failed:

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

You are currently cherry-picking commit ebbcfab6.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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.

@p0mvn p0mvn changed the title chore: update osmoutils to fix indexer config (main) (backport #8446) chore: update osmoutils to fix indexer config (v25.x) (backport #8446) Jun 26, 2024
@p0mvn p0mvn force-pushed the mergify/bp/v25.x/pr-8446 branch from 6a5fe17 to 3d7c5dc Compare June 26, 2024 01:58
@p0mvn p0mvn force-pushed the mergify/bp/v25.x/pr-8446 branch from 3d7c5dc to 1833b53 Compare June 26, 2024 02:03
@p0mvn p0mvn merged commit f2fe283 into v25.x Jun 26, 2024
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v25.x/pr-8446 branch June 26, 2024 04:01
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