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

4 ➡️ 5 #968

Merged
merged 19 commits into from
Aug 12, 2021
Merged

4 ➡️ 5 #968

merged 19 commits into from
Aug 12, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo4 to ign-gazebo5

Branch comparison: ign-gazebo5...ign-gazebo4

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

diegoferigo and others added 17 commits August 2, 2021 10:39
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Juan Oxoby <[email protected]>

Co-authored-by: Juan Oxoby <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Edifice to Citadel (#945)

Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
* add enable/disable diffdrive

Signed-off-by: Guillaume Doisy <[email protected]>

* remove debug

Signed-off-by: Guillaume Doisy <[email protected]>

* do not subscribe to enable if topic is empty

Signed-off-by: Guillaume Doisy <[email protected]>

* add test

Signed-off-by: Guillaume Doisy <[email protected]>

* lint and style

Signed-off-by: Guillaume Doisy <[email protected]>

* change enable type to bool and renamed to enabled

Signed-off-by: Guillaume Doisy <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>

Co-authored-by: Michael Carroll <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@chapulina chapulina requested a review from azeey as a code owner August 11, 2021 15:59
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Aug 11, 2021
luca-della-vedova and others added 2 commits August 12, 2021 07:06
Signed-off-by: Luca Della Vedova <[email protected]>
Signed-off-by: Ian Chen <[email protected]>

Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@codecov
Copy link

codecov bot commented Aug 12, 2021

Codecov Report

Merging #968 (ae8eb2e) into ign-gazebo5 (1e49379) will increase coverage by 0.89%.
The diff coverage is 64.08%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo5     #968      +/-   ##
===============================================
+ Coverage        65.76%   66.65%   +0.89%     
===============================================
  Files              246      247       +1     
  Lines            18788    18900     +112     
===============================================
+ Hits             12355    12598     +243     
+ Misses            6433     6302     -131     
Impacted Files Coverage Δ
src/ServerConfig.cc 89.68% <ø> (ø)
src/gui/plugins/scene3d/Scene3D.hh 50.00% <ø> (ø)
src/systems/lift_drag/LiftDrag.hh 100.00% <ø> (ø)
src/systems/velocity_control/VelocityControl.hh 100.00% <ø> (ø)
src/gui/plugins/scene3d/Scene3D.cc 10.41% <7.69%> (-0.04%) ⬇️
src/systems/lift_drag/LiftDrag.cc 62.85% <18.51%> (-7.08%) ⬇️
src/systems/physics/Physics.cc 70.27% <20.00%> (-0.20%) ⬇️
src/systems/joint_controller/JointController.cc 81.81% <90.90%> (+3.24%) ⬆️
include/ignition/gazebo/Util.hh 100.00% <100.00%> (ø)
src/TestFixture.cc 100.00% <100.00%> (ø)
... and 8 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 5eff5f8...ae8eb2e. 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.

Windows CI is failing

@chapulina
Copy link
Contributor Author

Windows CI is failing

I think that was a spurious failure, the latest build is good 🙌

@chapulina chapulina merged commit 0c401c1 into ign-gazebo5 Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.