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

3 ➡️ 4 #866

Merged
merged 12 commits into from
Jun 23, 2021
Merged

3 ➡️ 4 #866

merged 12 commits into from
Jun 23, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo3 to ign-gazebo4

Branch comparison: ign-gazebo4...ign-gazebo3

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

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

ahcorde and others added 7 commits May 26, 2021 22:45
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
)

Signed-off-by: ahcorde <ahcorde@gmail.com>

Co-authored-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
* Fix issue not configuring links added after start

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>

* Add a test checking the fix

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@github-actions github-actions bot added the 🔮 dome Ignition Dome label Jun 18, 2021
* Change the diff_drive_system test to cover min_acceleration
  and min_velocity limits. Added those limits to the .sdf file.

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

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Co-authored-by: Franco Cipollone <53065142+francocipollone@users.noreply.github.com>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@ahcorde ahcorde added the needs upstream release Blocked by a release of an upstream library label Jun 18, 2021
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.

it requires a ign-rendering4 release

chapulina and others added 2 commits June 18, 2021 12:20
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>
@chapulina chapulina mentioned this pull request Jun 18, 2021
7 tasks
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
This was referenced Jun 19, 2021
chapulina added a commit that referenced this pull request Jun 22, 2021
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@codecov
Copy link

codecov bot commented Jun 22, 2021

Codecov Report

Merging #866 (e81085e) into ign-gazebo4 (a1ebffa) will increase coverage by 0.29%.
The diff coverage is 78.57%.

❗ Current head e81085e differs from pull request most recent head f6a1a84. Consider uploading reports for the commit f6a1a84 to get more accurate results
Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo4     #866      +/-   ##
===============================================
+ Coverage        65.68%   65.98%   +0.29%     
===============================================
  Files              240      239       -1     
  Lines            17811    17657     -154     
===============================================
- Hits             11700    11651      -49     
+ Misses            6111     6006     -105     
Impacted Files Coverage Δ
src/gui/plugins/shapes/Shapes.cc 31.25% <ø> (ø)
.../gui/plugins/transform_control/TransformControl.cc 19.14% <0.00%> (+3.21%) ⬆️
src/systems/diff_drive/DiffDrive.cc 86.63% <75.00%> (+0.66%) ⬆️
src/systems/wind_effects/WindEffects.cc 78.37% <87.50%> (-0.66%) ⬇️
src/gui/plugins/scene3d/Scene3D.cc 9.97% <100.00%> (+0.32%) ⬆️

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 a1ebffa...f6a1a84. Read the comment docs.

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Jun 23, 2021
@chapulina
Copy link
Contributor Author

Phew, all upstream releases are in, this is ready! Let's merge it before there are more breaking changes 😅

@chapulina chapulina requested a review from jennuine June 23, 2021 00:29
@ahcorde ahcorde merged commit 1a7c606 into ign-gazebo4 Jun 23, 2021
@ahcorde ahcorde deleted the chapulina/3_to_4 branch June 23, 2021 08:23
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.

7 participants