Skip to content
This repository has been archived by the owner on Jan 31, 2025. It is now read-only.

chore(deps): bump github.com/cometbft/cometbft from 0.38.1 to 0.38.2 (backport #260) #266

Merged
merged 3 commits into from
Dec 5, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 4, 2023

This is an automatic backport of pull request #260 done by Mergify.
Cherry-pick of c4cf210 has failed:

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

You are currently cherry-picking commit c4cf210.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   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

…260)

Bumps [github.com/cometbft/cometbft](https://github.com/cometbft/cometbft) from 0.38.1 to 0.38.2.
- [Release notes](https://github.com/cometbft/cometbft/releases)
- [Changelog](https://github.com/cometbft/cometbft/blob/main/CHANGELOG.md)
- [Commits](cometbft/cometbft@v0.38.1...v0.38.2)

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

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

# Conflicts:
#	go.sum
@mergify mergify bot added the conflicts label Dec 4, 2023
@davidterpay
Copy link
Contributor

@Mergifyio rebase

Copy link
Author

mergify bot commented Dec 4, 2023

rebase

☑️ Nothing to do

  • -conflict [:pushpin: rebase requirement]
  • -closed [:pushpin: rebase requirement]

@davidterpay
Copy link
Contributor

@Mergifyio update

Copy link
Author

mergify bot commented Dec 4, 2023

update

☑️ Nothing to do

  • -conflict [:pushpin: update requirement]
  • #commits-behind>0 [:pushpin: update requirement]
  • -closed [:pushpin: update requirement]

@aljo242 aljo242 merged commit 1c4a2ed into release/v2.x.x Dec 5, 2023
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/release/v2.x.x/pr-260 branch December 5, 2023 03:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants