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(deps): bump gogo proto and ethereum version (backport #2338) #2351

Merged
merged 2 commits into from
Sep 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2023

This is an automatic backport of pull request #2338 done by Mergify.
Cherry-pick of 2654fc3 has failed:

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

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

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/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

<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

<!--
Please provide an explanation of the PR, including the appropriate
context,
background, goal, and rationale. If there is an issue with this
information,
please provide a tl;dr and link the issue.
-->

Now that gogo proto also cut a new release using the latest `x/exp`
package, we can bump its version and also the
version of Ethereum.

This would help me fix dependencies downstream in orchestrator-relayer
and testground tests.

We can also bump its version in cosmos-sdk, but I am not sure whether we
want to do that ourselves or wait until we get that from upstream. There
is a note in gogoproto stating:

> Dependencies depending on earlier version of x/exp may not be able to
bump to v1.4.11 because slices.SortFunc had some breaking changes. For
limiting breaking changes in patch versions, for instance, the Cosmos
SDK v0.47.x will not bump to v1.4.11.

## Checklist

<!--
Please complete the checklist to ensure that the PR is ready to be
reviewed.

IMPORTANT:
PRs should be left in Draft until the below checklist is completed.
-->

- [ ] New and updated code has appropriate documentation
- [ ] New and updated code has new and/or updated testing
- [ ] Required CI checks are passing
- [ ] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords

(cherry picked from commit 2654fc3)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot added the conflicts label Aug 24, 2023
@celestia-bot celestia-bot requested a review from a team August 24, 2023 20:53
@github-actions github-actions bot added the bot item was created by a bot label Aug 24, 2023
@rach-id rach-id self-assigned this Aug 24, 2023
Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this one will need manual intervention after we merge the v1.21 PR to v1.x

@celestia-bot celestia-bot requested a review from a team September 1, 2023 13:54
@rootulp rootulp self-assigned this Sep 1, 2023
@rootulp rootulp removed the conflicts label Sep 1, 2023
@rootulp rootulp marked this pull request as draft September 1, 2023 13:57
@rootulp rootulp marked this pull request as ready for review September 1, 2023 14:02
@rootulp rootulp requested a review from rach-id September 1, 2023 14:02
@rootulp rootulp merged commit 8b0decb into v1.x Sep 5, 2023
20 checks passed
@rootulp rootulp deleted the mergify/bp/v1.x/pr-2338 branch September 5, 2023 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants