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 ign-gazebo6 ➡️ main #1519

Merged
merged 4 commits into from
Jun 8, 2022
Merged

Merge ign-gazebo6 ➡️ main #1519

merged 4 commits into from
Jun 8, 2022

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Jun 6, 2022

➡️ Forward port

Port ign-gazebo6 ➡️ main

Branch comparision: main...ign-gazebo6

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

iche033 and others added 2 commits June 2, 2022 13:37
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
… in `<scene>` (#1515)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey requested review from iche033 and chapulina as code owners June 6, 2022 20:20
@codecov
Copy link

codecov bot commented Jun 6, 2022

Codecov Report

Merging #1519 (a3cbd8c) into main (09fd519) will increase coverage by 0.00%.
The diff coverage is 66.66%.

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

@@           Coverage Diff           @@
##             main    #1519   +/-   ##
=======================================
  Coverage   63.62%   63.62%           
=======================================
  Files         330      330           
  Lines       25784    25787    +3     
=======================================
+ Hits        16406    16408    +2     
- Misses       9378     9379    +1     
Impacted Files Coverage Δ
src/rendering/RenderUtil.cc 38.90% <ø> (+0.06%) ⬆️
src/systems/sensors/Sensors.cc 65.73% <66.66%> (+<0.01%) ⬆️
src/systems/physics/Physics.cc 64.84% <0.00%> (-0.08%) ⬇️
...s/multicopter_motor_model/MulticopterMotorModel.cc 76.13% <0.00%> (ø)

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 09fd519...c608355. Read the comment docs.

azeey added a commit that referenced this pull request Jun 8, 2022
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey force-pushed the azeey/6_to_main branch from 960ce0f to 15b6d75 Compare June 8, 2022 04:20
@azeey azeey force-pushed the azeey/6_to_main branch from 15b6d75 to c608355 Compare June 8, 2022 15:26
@azeey
Copy link
Contributor Author

azeey commented Jun 8, 2022

@chapulina can you give it another look. I merged other changes in ign-gazebo6 since you're approval. Also, it looks like there are a couple more test failures, but I can't see how they could be caused by this PR.

@chapulina chapulina merged commit 62de3a2 into main Jun 8, 2022
@chapulina chapulina deleted the azeey/6_to_main branch June 8, 2022 18:27
@j-rivero j-rivero mentioned this pull request Sep 16, 2022
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants