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

Cherry-pick #405 to garden: Fix compatibility with protobuf 22 #408

Merged
merged 2 commits into from
Jun 15, 2023

Conversation

scpeters
Copy link
Member

Part of osrf/homebrew-simulation#2274. Cherry-picking forward to assist with rebuilding broken bottles.

Thanks to @traversaro for the patch!

Use rebase-and-merge.

@scpeters scpeters requested a review from caguero as a code owner June 11, 2023 01:13
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Jun 11, 2023
@codecov
Copy link

codecov bot commented Jun 11, 2023

Codecov Report

Merging #408 (c8a83da) into gz-transport12 (c958aec) will increase coverage by 0.13%.
The diff coverage is 75.00%.

❗ Current head c8a83da differs from pull request most recent head d00b4c9. Consider uploading reports for the commit d00b4c9 to get more accurate results

@@                Coverage Diff                 @@
##           gz-transport12     #408      +/-   ##
==================================================
+ Coverage           87.17%   87.31%   +0.13%     
==================================================
  Files                  60       60              
  Lines                5209     5211       +2     
==================================================
+ Hits                 4541     4550       +9     
+ Misses                668      661       -7     
Impacted Files Coverage Δ
include/gz/transport/RepHandler.hh 85.36% <ø> (ø)
include/gz/transport/SubscriptionHandler.hh 84.90% <ø> (ø)
src/cmd/gz.cc 94.61% <75.00%> (-0.70%) ⬇️

... and 2 files with indirect coverage changes

@scpeters
Copy link
Member Author

attempting to fix a compiler warning in d00b4c9

@scpeters
Copy link
Member Author

attempting to fix a compiler warning in d00b4c9

coverage is slightly worse, but I'm not sure how to test the error case, so I'll just continue in order to get the fix merged

@scpeters scpeters merged commit 6c80037 into gz-transport12 Jun 15, 2023
@scpeters scpeters deleted the scpeters/pick_protobuf_fix_12 branch June 15, 2023 22:04
scpeters added a commit that referenced this pull request Jun 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants