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 cometbft to v0.37.1 (backport #15955) #15957

Merged
merged 2 commits into from
Apr 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 26, 2023

This is an automatic backport of pull request #15955 done by Mergify.
Cherry-pick of 6a8251a has failed:

On branch mergify/bp/release/v0.47.x/pr-15955
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit 6a8251aaf.
  (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:   client/v2/go.mod
	both modified:   client/v2/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	deleted by us:   store/go.mod
	deleted by us:   store/go.sum
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	deleted by us:   tools/confix/go.mod
	deleted by us:   tools/confix/go.sum
	both modified:   tools/cosmovisor/go.mod
	both modified:   tools/cosmovisor/go.sum
	deleted by us:   tools/hubl/go.mod
	deleted by us:   tools/hubl/go.sum
	both modified:   tools/rosetta/go.mod
	both modified:   tools/rosetta/go.sum
	deleted by us:   x/circuit/go.mod
	deleted by us:   x/circuit/go.sum
	deleted by us:   x/evidence/go.mod
	deleted by us:   x/evidence/go.sum
	deleted by us:   x/feegrant/go.mod
	deleted by us:   x/feegrant/go.sum
	deleted by us:   x/nft/go.mod
	deleted by us:   x/nft/go.sum
	deleted by us:   x/upgrade/go.mod
	deleted by us:   x/upgrade/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

@mergify mergify bot requested a review from a team as a code owner April 26, 2023 15:35
@mergify mergify bot added the conflicts label Apr 26, 2023
@github-actions github-actions bot added C:CLI C:Cosmovisor Issues and PR related to Cosmovisor C:Rosetta Issues and PR related to Rosetta C:Store C:x/evidence C:x/feegrant C:x/nft C:x/upgrade labels Apr 26, 2023
@julienrbrt julienrbrt self-assigned this Apr 26, 2023
@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.47.x/pr-15955 branch from 1d4c7aa to 23bed22 Compare April 26, 2023 16:11
@julienrbrt julienrbrt removed their assignment Apr 26, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) April 26, 2023 16:12
@julienrbrt julienrbrt merged commit 424afe8 into release/v0.47.x Apr 26, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-15955 branch April 26, 2023 16:37
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:Cosmovisor Issues and PR related to Cosmovisor C:Rosetta Issues and PR related to Rosetta C:Store C:x/evidence C:x/feegrant C:x/nft C:x/upgrade
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

1 participant