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 gogoproto to v1.4.11 and golang.org/x/exp to latest, sdk bump (backport #8253) #8273

Merged
merged 1 commit into from
May 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 16, 2024

Closes: #XXX

What is the purpose of the change

I'm looking to try out new traces:
https://go.dev/blog/execution-traces-2024

That requires a newer version of exp package

We force replace it here due to an API break in gogoproto.

The new gogoproto tag already contains the fix. As a result, I propose bumping it.

Testing and Verifying

I will run a node with this change to ensure no state-breaks

Documentation and Release Note

  • Does this pull request introduce a new feature or user-facing behavior changes?
  • Changelog entry added to Unreleased section of CHANGELOG.md?

Where is the change documented?

@mergify mergify bot requested a review from mattverse as a code owner May 16, 2024 14:13
@mergify mergify bot added the conflicts label May 16, 2024
@mergify mergify bot requested a review from nicolaslara as a code owner May 16, 2024 14:13
@mergify mergify bot assigned p0mvn May 16, 2024
Copy link
Contributor Author

mergify bot commented May 16, 2024

Cherry-pick of 5cdab9f has failed:

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

You are currently cherry-picking commit 5cdab9f5.
  (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:   go.sum
	modified:   osmomath/go.sum
	modified:   osmoutils/go.sum
	modified:   x/epochs/go.sum
	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:   osmomath/go.mod
	both modified:   osmoutils/go.mod
	both modified:   x/epochs/go.mod

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 force-pushed the mergify/bp/v25.x/pr-8253 branch from 4046b12 to 5c61ba5 Compare May 20, 2024 02:07
@p0mvn p0mvn merged commit c44a659 into v25.x May 20, 2024
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v25.x/pr-8253 branch May 20, 2024 02:30
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