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 github.com/cometbft/cometbft from 0.37.0-rc3 to 0.37.0 (backport #3247) #3252

Merged
merged 2 commits into from
Mar 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 7, 2023

This is an automatic backport of pull request #3247 done by Mergify.
Cherry-pick of 8ca7344 has failed:

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

You are currently cherry-picking commit 8ca7344a.
  (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.mod
	modified:   go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum

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

…7.0 (#3247)

* build(deps): bump github.com/cometbft/cometbft from 0.37.0-rc3 to 0.37.0

Bumps [github.com/cometbft/cometbft](https://github.com/cometbft/cometbft) from 0.37.0-rc3 to 0.37.0.
- [Release notes](https://github.com/cometbft/cometbft/releases)
- [Changelog](https://github.com/cometbft/cometbft/blob/v0.37.0/CHANGELOG.md)
- [Commits](cometbft/cometbft@v0.37.0-rc3...v0.37.0)

---
updated-dependencies:
- dependency-name: github.com/cometbft/cometbft
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: go mod tidy in e2e folder

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Colin Axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit 8ca7344)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
@damiannolan damiannolan removed their assignment Mar 7, 2023
@crodriguezvega crodriguezvega merged commit 6ea642e into release/v7.1.x Mar 7, 2023
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.1.x/pr-3247 branch March 7, 2023 21:05
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
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