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.

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

chore: extract buf version (backport #1327) #1355

Draft
wants to merge 1 commit into
base: v0.34.x-celestia
Choose a base branch
from
Draft

chore: extract buf version (backport #1327) #1355

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2024

Description

Closes #1253

PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use
    unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
This is an automatic backport of pull request #1327 done by [Mergify](https://mergify.com).

@TropicalDog17 @mergify
chore: extract buf version (#1327)
e9aa95f 
## Description
Closes #1253

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

---------

Co-authored-by: Rootul P <rootulp@gmail.com>
(cherry picked from commit b67d79e)

# Conflicts:
#	Makefile
@mergify mergify bot requested a review from a team as a code owner May 10, 2024 17:11
@mergify mergify bot removed the request for review from a team May 10, 2024 17:11
@mergify mergify bot added the conflicts label May 10, 2024
@mergify mergify bot requested review from rootulp and rach-id May 10, 2024 17:11
@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 10, 2024

Cherry-pick of b67d79e has failed:

On branch mergify/bp/v0.34.x-celestia/pr-1327
Your branch is up to date with 'origin/v0.34.x-celestia'.

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

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

rootulp
rootulp reviewed May 10, 2024
View reviewed changes
Copy link
Collaborator

@rootulp rootulp left a comment

Choose a reason for hiding this comment

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

Merge conflicts

@rootulp rootulp marked this pull request as draft May 10, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rootulp rootulp rootulp left review comments

@rach-id rach-id Awaiting requested review from rach-id rach-id is a code owner automatically assigned from celestiaorg/celestia-core

At least 2 approving reviews are required to merge this pull request.

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@rootulp @TropicalDog17