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

2 ➡️ 3 #262

Merged
merged 4 commits into from
Jun 18, 2021
Merged

2 ➡️ 3 #262

merged 4 commits into from
Jun 18, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-physics2 to ign-physics3

Branch comparison: ign-physics3...ign-physics2

Merging forward because I'd like to make a 3,X release including Bullet, see gazebo-release/ign-physics3-release#3

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

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

claireyywang and others added 2 commits May 3, 2021 15:15
Signed-off-by: claireyywang <[email protected]>
Signed-off-by: anindex <[email protected]>

Co-authored-by: anindex <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Co-authored-by: Claire Wang <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
@chapulina chapulina requested a review from mxgrey as a code owner June 16, 2021 22:56
@github-actions github-actions bot added the 🔮 dome Ignition Dome label Jun 16, 2021
@codecov
Copy link

codecov bot commented Jun 16, 2021

Codecov Report

Merging #262 (8cc844f) into ign-physics3 (068425f) will decrease coverage by 8.88%.
The diff coverage is 30.72%.

Impacted file tree graph

@@               Coverage Diff                @@
##           ign-physics3     #262      +/-   ##
================================================
- Coverage         83.27%   74.38%   -8.89%     
================================================
  Files               106      115       +9     
  Lines              3951     4697     +746     
================================================
+ Hits               3290     3494     +204     
- Misses              661     1203     +542     
Impacted Files Coverage Δ
bullet/src/FreeGroupFeatures.cc 0.00% <0.00%> (ø)
bullet/src/JointFeatures.cc 0.00% <0.00%> (ø)
bullet/src/KinematicsFeatures.cc 0.00% <0.00%> (ø)
bullet/src/ShapeFeatures.cc 0.00% <0.00%> (ø)
bullet/src/SimulationFeatures.cc 0.00% <0.00%> (ø)
dartsim/src/CustomMeshShape.cc 62.28% <ø> (ø)
dartsim/src/EntityManagementFeatures.cc 73.41% <ø> (ø)
dartsim/src/ShapeFeatures.cc 36.42% <ø> (ø)
include/ignition/physics/BoxShape.hh 100.00% <ø> (ø)
include/ignition/physics/Cloneable.hh 100.00% <ø> (ø)
... and 32 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ec547b...8cc844f. Read the comment docs.

Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

macos is failing on dart

/Users/jenkins/workspace/ignition_physics-ci-pr_any-homebrew-amd64/ign-physics/test/plugins/DARTDoublePendulum.cc:78:37: error: no member named 'setLimitEnforcement' in 'dart::dynamics::Joint'
          this->robot->getJoint(i)->setLimitEnforcement(false);
          ~~~~~~~~~~~~~~~~~~~~~~~~  ^
1 error generated.
make[2]: *** [test/plugins/CMakeFiles/MockDoublePendulum.dir/DARTDoublePendulum.cc.o] Error 1
make[1]: *** [test/plugins/CMakeFiles/MockDoublePendulum.dir/all] Error 2

scpeters added a commit to scpeters/ign-physics that referenced this pull request Jun 17, 2021
Copied from gazebosim#262.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters mentioned this pull request Jun 17, 2021
7 tasks
@scpeters
Copy link
Member

back-porting deprecation fix to ign-physics2 in #263

Copied from #262.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Copy link
Contributor Author

Updated this PR to include #263

@chapulina
Copy link
Contributor Author

@scpeters , can we get this one in to fix the new warnings?

@chapulina chapulina merged commit 01a3f49 into ign-physics3 Jun 18, 2021
@chapulina chapulina deleted the chapuina/2_to_3 branch June 18, 2021 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔮 dome Ignition Dome
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants