8000 Problem: cometbft dependency is not updated (backport #1635) by mergify[bot] · Pull Request #1637 · evmos/evmos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Problem: cometbft dependency is not updated (backport #1635) #1637

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jul 4, 2023
Merged

Problem: cometbft dependency is not updated (backport #1635) #1637

merged 3 commits into from
Jul 4, 2023

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jul 4, 2023

This is an automatic backport of pull request #1635 done by Mergify.
Cherry-pick of 3dc4511 has failed:

On branch mergify/bp/release/v12.x.x/pr-1635
Your branch is up to date with 'origin/release/v12.x.x'.

You are currently cherry-picking commit 3dc45119.
  (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:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod

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

@mmsqe @mergify
Problem: cometbft dependency is not updated (#1635)
b0de6be 
* Problem: cometbft dependency is not updated

* Update CHANGELOG.md

(cherry picked from commit 3dc4511)

# Conflicts:
#	CHANGELOG.md
#	go.mod
@mergify mergify bot requested a review from a team as a code owner July 4, 2023 12:40
@mergify mergify bot requested review from Vvaradinov and GAtom22 July 4, 2023 12:40
@mergify mergify bot added the conflicts label Jul 4, 2023
@mergify mergify bot mentioned this pull request Jul 4, 2023
Merged
Vvaradinov
Vvaradinov approved these changes Jul 4, 2023
View reviewed changes
Copy link
Contributor
@Vvaradinov Vvaradinov left a comment

Choose a reason for hiding this comment

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

LGTM!

@facs95 facs95 merged commit 3abe7b1 into release/v12.x.x Jul 4, 2023
@facs95 facs95 deleted the mergify/bp/release/v12.x.x/pr-1635 branch July 4, 2023 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Vvaradinov Vvaradinov Vvaradinov approved these changes

@facs95 facs95 facs95 approved these changes

@GAtom22 GAtom22 Awaiting requested review from GAtom22 GAtom22 is a code owner automatically assigned from evmos/core-engineering

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Vvaradinov @facs95 @mmsqe
0