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 v0.47 (backport #3295) #3301

Merged
merged 6 commits into from
Mar 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 15, 2023

This is an automatic backport of pull request #3295 done by Mergify.
Cherry-pick of 71e8bf4 has failed:

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

You are currently cherry-picking commit 71e8bf46.
  (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.mod
	modified:   go.sum
	modified:   modules/apps/27-interchain-accounts/module_test.go
	modified:   modules/core/02-client/abci_test.go
	modified:   testing/app.go
	modified:   testing/endpoint.go
	modified:   testing/simapp/sim_bench_test.go
	modified:   testing/simapp/sim_test.go
	modified:   testing/simapp/simd/cmd/root.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/dockerutil/dockerutil.go
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum
	deleted by us:   e2e/testsuite/diagnostics/diagnostics.go
	deleted by us:   e2e/testsuite/events.go
	deleted by us:   e2e/testsuite/grpc_query.go
	both modified:   testing/README.md

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

Co-authored-by: Damian Nolan <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit 71e8bf4)

# Conflicts:
#	e2e/dockerutil/dockerutil.go
#	e2e/go.mod
#	e2e/go.sum
#	e2e/testsuite/diagnostics/diagnostics.go
#	e2e/testsuite/events.go
#	e2e/testsuite/grpc_query.go
#	testing/README.md
Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

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

Thank you @crodriguezvega for fixing the conflicts!

@crodriguezvega crodriguezvega merged commit 7fb65c7 into release/v7.0.x Mar 16, 2023
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.0.x/pr-3295 branch March 16, 2023 12:40
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.

4 participants