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 #554

Merged
merged 8 commits into from
Sep 27, 2023
Merged

Merge: 6 -> 7 #554

merged 8 commits into from
Sep 27, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 26, 2023

➡️ Forward port

Port gz-physics6 to gz-physics7

Branch comparison: gz-physics7...gz-physics6

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

azeey and others added 8 commits September 1, 2023 13:08
Signed-off-by: Addisu Z. Taddese <[email protected]>
)

Fixes a segfault that occurs due to destructors being removed from memory before they're called.
---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
* Cleaning up bullet memory use issues
* Fix Windows warning
* Fix same issue in bullet (non-featherstone) implementation

---------

Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
This sets console verbosity to zero when passing NaN
commands in the test to reduce console spam.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Sep 26, 2023
@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #554 (4e2bd57) into gz-physics7 (578b4ed) will increase coverage by 0.04%.
The diff coverage is 84.44%.

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

@@               Coverage Diff               @@
##           gz-physics7     #554      +/-   ##
===============================================
+ Coverage        76.11%   76.15%   +0.04%     
===============================================
  Files              140      140              
  Lines             7762     7793      +31     
===============================================
+ Hits              5908     5935      +27     
- Misses            1854     1858       +4     
Files Coverage Δ
bullet-featherstone/src/Base.hh 100.00% <100.00%> (ø)
bullet-featherstone/src/SDFFeatures.cc 74.54% <100.00%> (ø)
bullet/src/Base.hh 76.13% <100.00%> (+4.13%) ⬆️
bullet-featherstone/src/JointFeatures.cc 57.69% <75.00%> (-0.57%) ⬇️
bullet-featherstone/src/FreeGroupFeatures.cc 0.00% <0.00%> (ø)

@mjcarroll mjcarroll merged commit 19db74c into gz-physics7 Sep 27, 2023
7 checks passed
@mjcarroll mjcarroll deleted the merge_6_7_20230926 branch September 27, 2023 13:48
mjcarroll added a commit that referenced this pull request Sep 27, 2023
Signed-off-by: Michael Carroll <[email protected]>
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