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 ign-gazebo3 ➡️ ign-gazebo6 #1626

Merged
merged 12 commits into from
Aug 4, 2022
Merged

Merge ign-gazebo3 ➡️ ign-gazebo6 #1626

merged 12 commits into from
Aug 4, 2022

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Aug 3, 2022 •
edited
Loading

➡️ Forward port

Port ign-gazebo3 ➡️ ign-gazebo6

Branch comparision: ign-gazebo6...ign-gazebo3

Needs

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

AzulRadio and others added 10 commits July 14, 2022 21:58
@AzulRadio
Implement Pose3d with common widget pose (#1571)
df45262 
Signed-off-by: youhy <haoyuan2019@outlook.com>
@chapulina
Add Model::CanonicalLink getter (#1594)
33a0fce 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@jennuine
Ignition -> Gazebo (#1596)
6d3eac2 
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
@scpeters
Fix compilation of scene broadcaster test (#1599)
c565398 
This test fails to compile with the latest version
of protobuf, which is currently available on macOS.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@chapulina @ahcorde
Helper function to get an entity from an entity message (#1595)
4585958 
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@AzulRadio @chapulina
Implement vector3 with common widget vector3 (#1569)
3ee889b 
Signed-off-by: youhy <haoyuan2019@outlook.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
@chapulina
New Apply Link Wrench system (#1593)
8552299 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina @knoedler
@gitak2019 @LolaSegura @andyblarblar @ahcorde
Add Ackermann Steering system (backport from Fortress) (#1613)
61dc78d 
* Ackermann Steering Plugin (#618)

Signed-off-by: Kevin <ak619@lafn.org>

Co-authored-by: Kevin <ak619@lafn.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

* Using math::SpeedLimiter on the ackermann_steering controller. (#837)

Signed-off-by: LolaSegura <lsegura@ekumenlabs.com>

* Add Tf publishing to AckermannSteering system (#1576)

Signed-off-by: Andrew Ealovega <Andrew@Ealovega.dev>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: knoedler <knoedler@dslextreme.com>
Co-authored-by: Kevin <ak619@lafn.org>
Co-authored-by: LolaSegura <48759425+LolaSegura@users.noreply.github.com>
Co-authored-by: Andrew Ealovega <andyblarblar@gmail.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@chapulina @scpeters
Quiet libSDFormat console on --verbose 0 (#1621)
e2a4d93 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@mayman99 @chapulina
Quick start dialog (#1536)
2edbf56 
Signed-off-by: Mohamad <mohamad@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Mohamad <mohamad@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Aug 3, 2022
@chapulina chapulina added the 🏯 fortress Ignition Fortress label Aug 3, 2022
@chapulina chapulina mentioned this pull request Aug 3, 2022
Closed
@codecov
Copy link

codecov bot commented Aug 3, 2022 •
edited
Loading

Codecov Report

Merging #1626 (7fb9cd0) into ign-gazebo6 (aef3020) will increase coverage by 0.37%.
The diff coverage is 76.85%.

❗ Current head 7fb9cd0 differs from pull request most recent head 4565a17. Consider uploading reports for the commit 4565a17 to get more accurate results

@@               Coverage Diff               @@
##           ign-gazebo6    #1626      +/-   ##
===============================================
+ Coverage        64.01%   64.38%   +0.37%     
===============================================
  Files              317      320       +3     
  Lines            25788    25892     +104     
===============================================
+ Hits             16507    16671     +164     
+ Misses            9281     9221      -60
Impacted Files Coverage Δ
include/ignition/gazebo/Model.hh 100.00% <ø> (ø)
include/ignition/gazebo/SystemLoader.hh 100.00% <ø> (ø)
include/ignition/gazebo/Util.hh 100.00% <ø> (ø)
src/ServerConfig.cc 90.69% <ø> (ø)
.../plugins/component_inspector/ComponentInspector.cc 5.33% <0.00%> (+0.25%) ⬆️
.../plugins/component_inspector/ComponentInspector.hh 28.57% <ø> (ø)
src/ign.cc 64.60% <24.13%> (-7.29%) ⬇️
src/systems/apply_link_wrench/ApplyLinkWrench.cc 77.61% <77.61%> (ø)
src/gui/Gui.cc 72.13% <78.35%> (+10.16%) ⬆️
src/gui/QuickStartHandler.cc 81.25% <81.25%> (ø)
... and 8 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Aug 3, 2022
chapulina added a commit that referenced this pull request Aug 3, 2022
@chapulina
Fix Windows linkage (#1626)
74d8e62 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
chapulina added a commit that referenced this pull request Aug 3, 2022
@chapulina
Fix Windows linkage (#1626)
adf7210 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

Failures:

  • ABI checker: false positive for namespace ignition::gazebo::v6 SystemLoader::PluginPaths ( ) const being removed
  • Actions Bionic: one green one red: flaky
  • Actions Focal: in one INTEGRATION_recreate_entities failed, on the other INTEGRATION_scene_broadcaster_system: flakies
  • Actions Jammy: UNIT_Gui_TEST is segfaulting on ign-gazebo6 too: https://github.com/gazebosim/gz-sim/actions/runs/2786699149
  • Homebrew: INTEGRATION_scene_broadcaster_system and UNIT_SimulationRunner_TEST are flakies
  • Jenkins Focal: INTEGRATION_recreate_entities is flaky
  • 👀 Windows: new infra failures, looking into it

@chapulina
Copy link
Contributor Author

Windows CI is in a bad state since gazebo-tooling/gazebodistro#117 and I'd like to move this PR forward. I'm ok merging without Windows results and coming back to fix it later if needed, since it's not an officially supported platform we don't need to block on it.

@chapulina
Copy link
Contributor Author

This is blocked waiting for

@chapulina
Fix loading worlds from CLI (#1627)
1cf75f3 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
3 ➡️ 6 (#1626)
4565a17 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina enabled auto-merge August 4, 2022 15:21
@chapulina chapulina disabled auto-merge August 4, 2022 15:21
@chapulina chapulina merged commit 8c9489d into ign-gazebo6 Aug 4, 2022
@chapulina chapulina deleted the chapulina/3_to_6 branch August 4, 2022 15:21
@scpeters scpeters mentioned this pull request Aug 17, 2022
Merged
@iche033 iche033 mentioned this pull request Sep 1, 2022
Merged
8 tasks
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

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@chapulina @mjcarroll @AzulRadio @jennuine @scpeters @mayman99