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

build(deps): Bump cosmossdk.io/store from 1.0.0-rc.0 to 1.0.0 (backport #5009) #5010

Merged
merged 5 commits into from
Nov 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 2, 2023

This is an automatic backport of pull request #5009 done by Mergify.
Cherry-pick of 0d55fe1 has failed:

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

You are currently cherry-picking commit 0d55fe1f.
  (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:   e2e/go.mod
	both modified:   e2e/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   modules/apps/callbacks/go.mod
	both modified:   modules/apps/callbacks/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

* build(deps): Bump cosmossdk.io/store from 1.0.0-rc.0 to 1.0.0

Bumps [cosmossdk.io/store](https://github.com/cosmos/cosmos-sdk) from 1.0.0-rc.0 to 1.0.0.
- [Release notes](https://github.com/cosmos/cosmos-sdk/releases)
- [Changelog](https://github.com/cosmos/cosmos-sdk/blob/main/CHANGELOG.md)
- [Commits](cosmos/cosmos-sdk@math/v1.0.0-rc.0...log/v1.0.0)

---
updated-dependencies:
- dependency-name: cosmossdk.io/store
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: go mod tidy

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: chatton <[email protected]>
(cherry picked from commit 0d55fe1)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
@@ -31,10 +31,10 @@ require (
cosmossdk.io/core v0.11.0 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/log v1.2.1 // indirect
cosmossdk.io/store v1.0.0-rc.0 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

e2e should be rm'd on release/v8?

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.

Thanks @crodriguezvega for fixing the conflicts 🙏

We should remove the e2e directory from the release branch right?

@crodriguezvega crodriguezvega merged commit 24a47ae into release/v8.0.x Nov 3, 2023
19 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v8.0.x/pr-5009 branch November 3, 2023 19:19
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