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

Merge 6 ➡️ 7 #594

Merged
merged 8 commits into from
Feb 15, 2024
Merged

Merge 6 ➡️ 7 #594

merged 8 commits into from
Feb 15, 2024

Conversation

caguero
Copy link
Contributor

@caguero caguero commented Feb 3, 2024

➡️ Forward port

Port gz-launch6 to gz-launch7

Branch comparison: gazebosim/gz-launch@gz-launch7...gz-launch6

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

iche033 and others added 3 commits January 30, 2024 15:22
This cleans up physics tests in a few ways:

Consolidate TestUtilities.hh and test/Utils.hh
Move test headers to test/include/test
Move mock headers to test/include/mock
Create an INTERFACE library for test/mock headers that sets common compiler definitions as well as common libraries to link against
Remove all instances of hardcoded world names or resource names and instead use constants.

Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Feb 3, 2024
@iche033
Copy link
Contributor

iche033 commented Feb 5, 2024

   [ 22%] Building CXX object test/common_test/CMakeFiles/COMMON_TEST_joint_mimic_features.dir/joint_mimic_features.cc.o
  /github/workspace/test/common_test/joint_mimic_features.cc:28:10: fatal error: TestLibLoader.hh: No such file or directory
     28 | #include "TestLibLoader.hh"

looks like the include path for TestLibLoader.hh has changed. It's now in a test subdir. So we'll need to update the new tests in gz-physics7 to use #include "test/TestLibLoader.hh"

Copy link

codecov bot commented Feb 6, 2024

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (5f73faf) 77.83% compared to head (cd290e0) 77.76%.

Files Patch % Lines
dartsim/src/GzOdeCollisionDetector.cc 82.85% 6 Missing ⚠️
dartsim/src/WorldFeatures.cc 83.33% 3 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           gz-physics7     #594      +/-   ##
===============================================
- Coverage        77.83%   77.76%   -0.08%     
===============================================
  Files              140      140              
  Lines             7772     7788      +16     
===============================================
+ Hits              6049     6056       +7     
- Misses            1723     1732       +9     

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

@@ -27,6 +27,7 @@

#define GZ_PHYSICS_VERSION "${PROJECT_VERSION}"
#define GZ_PHYSICS_VERSION_FULL "${PROJECT_VERSION_FULL}"
#define GZ_PHYSICS_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}
Copy link
Member

Choose a reason for hiding this comment

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

the fact that this macro wasn't defined was a mistake, but defining it now changes ABI

Copy link
Member

Choose a reason for hiding this comment

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

This reverts commit 1016539.

Signed-off-by: Michael Carroll <[email protected]>
@scpeters
Copy link
Member

scpeters commented Feb 6, 2024

1016539 has been reverted, so let's sync with gz-physics6 again

@mjcarroll mjcarroll merged commit 23a9109 into gz-physics7 Feb 15, 2024
8 of 10 checks passed
@mjcarroll mjcarroll deleted the 6_to_7again branch February 15, 2024 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants