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

Cherry pick fix for macOS build #1601

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Cherry pick fix for macOS build #1601

merged 1 commit into from
Jul 19, 2022

Conversation

scpeters
Copy link
Member

🦟 Bug fix

Cherry-pick #1599 forward to ign-gazebo6

Summary

This fixes the build with new versions of protobuf in use on macOS. I tried merging it forward, but there were tons of conflicts, so I'm cherry-picking it to more quickly fix CI.

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

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

@scpeters
Fix compilation of scene broadcaster test (#1599)
2d954ae 
This test fails to compile with the latest version
of protobuf, which is currently available on macOS.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from chapulina as a code owner July 19, 2022 18:21
ahcorde
ahcorde reviewed Jul 19, 2022
View reviewed changes
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

can we make a forward port ? why just this commit ?

chapulina
chapulina approved these changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

I'm ok with cherry-picking this one, since it's important to fix the build. We can do a proper forward-port separately.

@scpeters
Copy link
Member Author

can we make a forward port ? why just this commit ?

there were a lot of conflicts that I didn't know how to properly resolve. I've started resolving some of them in #1602

@scpeters scpeters merged commit 44406a9 into ign-gazebo6 Jul 19, 2022
@scpeters scpeters deleted the scpeters/pick_fix_6 branch July 19, 2022 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde left review comments

@chapulina chapulina chapulina approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@scpeters @ahcorde @chapulina