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

deps: bump SDK to v0.46.6 (backport #2784) #2793

Merged
merged 7 commits into from
Nov 24, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 19, 2022

This is an automatic backport of pull request #2784 done by Mergify.
Cherry-pick of db5e738 has failed:

On branch mergify/bp/release/v6.0.x/pr-2784
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit db5e738.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum
	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

* deps: bump SDK to v0.46.5

* bump SDK to v0.46.5 in e2e

* deps: bump to SDK v0.46.6

Co-authored-by: Carlos Rodriguez <crodveg@gmail.com>
(cherry picked from commit db5e738)

# Conflicts:
#	CHANGELOG.md
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
e2e/go.mod Outdated
Comment on lines 1 to 15
module github.com/cosmos/ibc-go/e2e

go 1.18

replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// TODO: using version v1.0.0 causes a build failure. This is the previous version which compiles successfully.
replace (
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7
)

// uncomment to use the local version of ibc-go, you will need to run `go mod tidy` in e2e directory.
replace github.com/cosmos/ibc-go/v6 => ../
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can remove all e2e on the release branch?

@crodriguezvega
Copy link
Contributor

remove e2e go module

Thanks, @colin-axner!

@crodriguezvega crodriguezvega merged commit 9e4165c into release/v6.0.x Nov 24, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v6.0.x/pr-2784 branch November 24, 2022 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants