Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 15, 2025

Summary

Fix compatibility with protobuf v30 (cpp 6.30.0) - similar to gz-msgs #499

Checklist

  • [ x] Signed all commits for DCO
  • [ n/a] Added tests
  • [ n/a] Updated documentation (as needed)
  • [ n/a] Updated migration guide (as needed)
  • [ n/a] Consider updating Python bindings (if the library has them)
  • [ x] codecheck passed (See contributing)
  • [ x] All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Copy link
Author

mergify bot commented Aug 15, 2025

Cherry-pick of e1eb227 has failed:

On branch mergify/bp/ign-gui6/pr-677
Your branch is up to date with 'origin/ign-gui6'.

You are currently cherry-picking commit e1eb227.
  (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:   src/plugins/topic_viewer/TopicViewer.cc

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

Signed-off-by: bill ross <4451962+bill997@users.noreply.github.com>
Co-authored-by: bill ross <4451962+bill997@users.noreply.github.com>
Co-authored-by: Ian Chen <ichen@openrobotics.org>
(cherry picked from commit e1eb227)
@scpeters scpeters force-pushed the mergify/bp/ign-gui6/pr-677 branch from 36824f0 to aa2cd65 Compare August 25, 2025 01:37
@scpeters
Copy link
Member

There is a test failure on brew, but this fixes the build so I will merge

@scpeters scpeters merged commit c1c1155 into ign-gui6 Aug 25, 2025
8 of 10 checks passed
@scpeters scpeters deleted the mergify/bp/ign-gui6/pr-677 branch August 25, 2025 03:53
@github-project-automation github-project-automation bot moved this from Inbox to Done in Core development Aug 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants