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

feat: make ChangeSet and KVPair protobuf serializable (backport #726) #733

Merged
merged 3 commits into from
Apr 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 10, 2023

This is an automatic backport of pull request #726 done by Mergify.
Cherry-pick of 61be28a has failed:

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

You are currently cherry-picking commit 61be28a.
  (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:
	new file:   buf.gen.yaml
	new file:   proto/buf.lock
	new file:   proto/buf.md
	new file:   proto/buf.yaml
	new file:   proto/changeset.pb.go
	new file:   proto/changeset.proto

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   diff.go
	deleted by us:   diff_test.go
	both modified:   nodedb.go

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

(cherry picked from commit 61be28a)

# Conflicts:
#	CHANGELOG.md
#	diff.go
#	diff_test.go
#	nodedb.go
@mergify mergify bot requested a review from a team as a code owner April 10, 2023 08:55
@mergify mergify bot added the conflicts label Apr 10, 2023
@yihuang
Copy link
Collaborator

yihuang commented Apr 10, 2023

It seems the whole diff/changeset thing don't get backport-ed to v0.20.x, I guess we can open a separate PR to backport the whole thing if want to.
v0.20.x's changelog seems the same as v0.19.x, what's the plan for v0.20.x?

@tac0turtle
Copy link
Member

.20 is what is used in the sdk right now. @cool-develope can create an issue or doc on whats needed for the migration? which versions and so on

@tac0turtle tac0turtle requested a review from yihuang April 20, 2023 10:33
@tac0turtle tac0turtle merged commit e74c486 into release/v0.20.x Apr 22, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.20.x/pr-726 branch April 22, 2023 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants