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

Merge 10 -> main #430

Merged
merged 26 commits into from
Mar 14, 2024
Merged

Merge 10 -> main #430

merged 26 commits into from
Mar 14, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Mar 14, 2024

➡️ Forward port

Port gz-msgs10 to main

Branch comparison: main...gz-msgs10

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

traversaro and others added 26 commits October 3, 2023 14:43
@traversaro
Set GZ_TOOLS_VER to 2 for consistency with rest of Garden and Harmoni…
fac43a8 
…c libraries (#391)

Signed-off-by: Silvio Traversaro <[email protected]>
@traversaro @mjcarroll
Fix cross-compilation support for gz-msg10 (#392)
0622409 
Signed-off-by: Silvio Traversaro <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
@mjcarroll
Miscellaneous housekeeping (#398)
edd9632 
Signed-off-by: Michael Carroll <[email protected]>
@Voldivh
Enables cmd commands on Windows (#402)
3d7793f 
Signed-off-by: Voldivh <[email protected]>
@arjo129
Fix compiler warning in generator.cc (#403)
1b0b0f8 
Signed-off-by: Arjo Chakravarty <[email protected]>
@mjcarroll
Fix memory leak in generator plugin code (#404)
8021595 
Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll
Miscellaneous cleanups of protobuf generator plugin (#405)
25759b6 
Signed-off-by: Michael Carroll <[email protected]>
@jrutgeer @mjcarroll
Added missing parts to the CMakeLists.txt code. (#400)
3d60486 
Signed-off-by: Johan Rutgeerts <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
@traversaro @mjcarroll
Ensure that tests pass fine with GZ_RELOCATABLE_INSTALL option enabled (
4f32cf4 
#394)

Signed-off-by: Silvio Traversaro <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
@mjcarroll
Bazel: Fix py_binary location (#406)
29cfe33 
Signed-off-by: Michael Carroll <[email protected]>
@iche033
Update CI badges in README (#412)
47eed13 
Signed-off-by: Ian Chen <[email protected]>
@bperseghetti
Add proto message for MaterialColor. (#414)
ce3ccb9 
* Add proto message for MaterialColor.

This proto message allows for changing the material colors of
an entities visual.

Signed-off-by: Benjamin Perseghetti <[email protected]>
@bperseghetti
Update material_color to use Entity. (#415)
35a267f 
Signed-off-by: Benjamin Perseghetti <[email protected]>
@bperseghetti
Add EntityMatch Enum to MaterialColor (#416)
a97d59b 
Signed-off-by: Benjamin Perseghetti <[email protected]>
@azeey
Prepare for 10.1.0~pre1 (#417)
b7b08ab 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Prepare for 10.1.0-pre1 (increment version) (#418)
6936306 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Prepare for 10.1.0 (#419)
daeb089 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@scpeters
Remove duplicate find_package(Python3) call (#420)
2b66954 
Signed-off-by: Steve Peters <[email protected]>
@caguero
Merge branch 'gz-msgs9' into 9_to_10
ea68ca0
@mjcarroll
Merge 9 ➡️ 10 (#421)
50f2f00 
Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll
Conditionally use cmake_path on cmake < 3.20 (#424)
b35b9fd 
Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll
Allow topic and service to construct messages from description files (#…
fd36d69 
…428)

The current implementation allows for additional messages to be read from these files, it was just not properly configured for the files to be accessible

Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll
Merge branch 'gz-msgs9' into gz-msgs10
727ea7b 
Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll
Include descriptors target
1939fb0 
Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll
port: gz-msgs9 to gz-msgs10 (#429)
f253f69 
Signed-off-by: Michael Carroll <[email protected]>
@iche033
merge from gz-msgs10
3656ce2 
Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 requested a review from caguero as a code owner March 14, 2024 00:18
@iche033 iche033 requested review from mjcarroll and removed request for caguero March 14, 2024 00:18
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Mar 14, 2024
@iche033 iche033 requested a review from caguero March 14, 2024 00:18
@iche033 iche033 mentioned this pull request Mar 14, 2024
Merged
@codecov Codecov
Copy link

codecov bot commented Mar 14, 2024

Codecov Report

Attention: Patch coverage is 97.22222% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 98.32%. Comparing base (2effe83) to head (3656ce2).

Files Patch % Lines
core/src/DynamicFactory.cc 96.66% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #430      +/-   ##
==========================================
+ Coverage   97.41%   98.32%   +0.91%     
==========================================
  Files          27       27              
  Lines        1201     1197       -4     
==========================================
+ Hits         1170     1177       +7     
+ Misses         31       20      -11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mjcarroll mjcarroll merged commit 78d84ab into main Mar 14, 2024
10 of 11 checks passed
@mjcarroll mjcarroll deleted the merge_10_main_20240313 branch March 14, 2024 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjcarroll mjcarroll mjcarroll approved these changes

@ahcorde ahcorde ahcorde approved these changes

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

Assignees
No one assigned
Labels
🏛️ ionic Gazebo Ionic
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.