Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 22, 2025

🦟 Bug fix

Summary

As of Protobuf 30, DebugString may contain some randomized content in order to redact sensitive information. This adapts gazebosim/gz-transport#685 for gz-gui.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • 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
  • Was GenAI used to generate this PR? If so, make sure to add "Generated-by" to your commits. (See this policy for more info.)

Generated-by: Remove this if GenAI was not used.

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


This is an automatic backport of pull request #703 done by Mergify.

@mergify mergify bot added the conflicts label Aug 22, 2025
@mergify mergify bot requested a review from jennuine as a code owner August 22, 2025 21:48
Copy link
Author

mergify bot commented Aug 22, 2025

Cherry-pick of 0262982 has failed:

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

You are currently cherry-picking commit 0262982.
  (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/publisher/Publisher.cc
	both modified:   src/plugins/topic_echo/TopicEcho.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

@mergify mergify bot added the conflicts label Aug 22, 2025
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Aug 22, 2025
@scpeters scpeters force-pushed the mergify/bp/ign-gui6/pr-703 branch from fa095b3 to a873675 Compare August 25, 2025 12:32
As of Protobuf 30, DebugString may contain some randomized content in
order to redact sensitive information. This adapts
gazebosim/gz-transport#685 for gz-gui.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
(cherry picked from commit 0262982)
@scpeters scpeters force-pushed the mergify/bp/ign-gui6/pr-703 branch from a873675 to 009f8ed Compare August 25, 2025 12:48
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Aug 25, 2025
@scpeters scpeters merged commit c29d652 into ign-gui6 Aug 25, 2025
11 of 13 checks passed
@scpeters scpeters deleted the mergify/bp/ign-gui6/pr-703 branch August 25, 2025 17:36
@github-project-automation github-project-automation bot moved this from In review 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

🏯 fortress Ignition Fortress

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants