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

Backport #2006 to citadel: Fix finding new versions of protobuf #2017

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Backport #2006 to citadel: Fix finding new versions of protobuf #2017

merged 1 commit into from
Jun 22, 2023

Conversation

scpeters
Copy link
Member

Part of osrf/homebrew-simulation#2274. Use rebase and merge.

@traversaro @scpeters
Protobuf: Do not require version 3 do support Protobuf 4.23.2 (23.2) (#…
b61f914 
…2006)

Signed-off-by: Silvio Traversaro <silvio@traversaro.it>

* TriggeredPublisher: don't catch FatalException
  It has been removed from recent versions of protobuf.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested a review from mjcarroll as a code owner June 15, 2023 22:35
@github-actions github-actions bot added the 🏰 citadel Ignition Citadel label Jun 15, 2023
@codecov
Copy link

codecov bot commented Jun 15, 2023

Codecov Report

Merging #2017 (a0a2e73) into ign-gazebo3 (1038a35) will increase coverage by 0.00%.
The diff coverage is 100.00%.

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

@@             Coverage Diff              @@
##           ign-gazebo3    #2017   +/-   ##
============================================
  Coverage        70.76%   70.76%           
============================================
  Files              262      262           
  Lines            16763    16760    -3     
============================================
- Hits             11862    11861    -1     
+ Misses            4901     4899    -2
Impacted Files Coverage Δ
.../systems/triggered_publisher/TriggeredPublisher.cc 83.11% <100.00%> (+1.06%) ⬆️

... and 1 file with indirect coverage changes

@scpeters
Copy link
Member Author

I believe test failures on macOS are from gazebosim/gz-physics#442

@scpeters scpeters merged commit e22e381 into ign-gazebo3 Jun 22, 2023
@scpeters scpeters deleted the scpeters/pick_protobuf_fix_3 branch June 22, 2023 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkoenig nkoenig nkoenig approved these changes

@mjcarroll mjcarroll Awaiting requested review from mjcarroll mjcarroll is a code owner

Assignees
No one assigned
Labels
🏰 citadel Ignition Citadel
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@scpeters @nkoenig @traversaro