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 #695

Merged
merged 27 commits into from
Mar 20, 2021
Merged

4 ➡️ 5 #695

merged 27 commits into from
Mar 20, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo4 to main

Branch comparison: main...ign-gazebo4

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

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

iche033 and others added 24 commits March 4, 2021 18:49
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: Martiño Crespo <marticres@gmail.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Mabel Zhang <mabel@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: osrf <jenn@openrobotics.org>
…sages in NetworkManagerPrimary (#470)

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Gonzalo de Pedro <gonzalo@depedro.com.ar>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Louise Poubel <louise@openrobotics.org>
See: https://bugreports.qt.io/browse/QTBUG-89114
Signed-off-by: acxz <17132214+acxz@users.noreply.github.com>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Signed-off-by: Kevin <ak619@lafn.org>

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

Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@chapulina chapulina added the beta Targeting beta release of upcoming collection label Mar 18, 2021
@chapulina chapulina requested review from azeey and iche033 as code owners March 18, 2021 02:31
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Mar 18, 2021
@adlarkin
Copy link
Contributor

adlarkin commented Mar 19, 2021

@chapulina, I went ahead and updated this PR with the latest changes from the main branch (c526c9d). @mjcarroll took a look, and everything seems to be okay. I'll wait to see what results we get from CI.

@chapulina
Copy link
Contributor Author

The JointPositionController_TEST failed again, and I don't see the changes from #697 on this branch, so I'll give the merge another try

chapulina added a commit that referenced this pull request Mar 19, 2021
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

🤞

@codecov
Copy link

codecov bot commented Mar 19, 2021

Codecov Report

Merging #695 (84ae007) into main (ddcf64f) will increase coverage by 0.45%.
The diff coverage is 77.14%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #695      +/-   ##
==========================================
+ Coverage   64.91%   65.36%   +0.45%     
==========================================
  Files         235      240       +5     
  Lines       16958    17514     +556     
==========================================
+ Hits        11008    11448     +440     
- Misses       5950     6066     +116     
Impacted Files Coverage Δ
src/rendering/RenderUtil.cc 42.46% <0.00%> (-0.19%) ⬇️
src/systems/velocity_control/VelocityControl.hh 100.00% <ø> (ø)
src/gui/plugins/scene3d/Scene3D.cc 9.36% <12.50%> (-0.58%) ⬇️
src/gui/plugins/entity_tree/EntityTree.cc 13.11% <50.00%> (-0.63%) ⬇️
...int_position_controller/JointPositionController.cc 60.57% <60.57%> (ø)
src/systems/ackermann_steering/SpeedLimiter.cc 85.71% <85.71%> (ø)
...rc/systems/ackermann_steering/AckermannSteering.cc 86.79% <86.79%> (ø)
src/systems/physics/Physics.cc 69.03% <86.95%> (+0.22%) ⬆️
...int_position_controller/JointPositionController.hh 100.00% <100.00%> (ø)
...rc/systems/ackermann_steering/AckermannSteering.hh 100.00% <100.00%> (ø)
... and 9 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 ddcf64f...84ae007. Read the comment docs.

@chapulina
Copy link
Contributor Author

Ahhhh Windows, let me fix it

Signed-off-by: Louise Poubel <louise@openrobotics.org>
chapulina added a commit that referenced this pull request Mar 19, 2021
Signed-off-by: Louise Poubel <louise@openrobotics.org>
chapulina added a commit that referenced this pull request Mar 19, 2021
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

Pushed an attempt at fixing Windows linker errors for the GUI test

chapulina added a commit that referenced this pull request Mar 19, 2021
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

Latest push disables the GUI plugin tests on Windows for now

@adlarkin
Copy link
Contributor

Latest push disables the GUI plugin tests on Windows for now

Should we create an issue so that we can re-visit this later?

chapulina added a commit that referenced this pull request Mar 20, 2021
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

Should we create an issue so that we can re-visit this later?

There are lots of disabled and failing tests on Windows, so I think at this point we don't need to track them individually yet.

@chapulina
Copy link
Contributor Author

Ok! Windows is building. The only suspicious test failure is a timeout for INTEGRATION_examples_build, which I don't think I've seen before. But it looks to me that it could be due to a slow CI machine. Merging!

81: [ 50%] Building CXX object CMakeFiles/joy_to_twist.dir/joy_to_twist.cc.o
 81/174 Test  #81: INTEGRATION_examples_build .............................***Timeout 240.01 sec

@chapulina chapulina merged commit 563e2c2 into main Mar 20, 2021
@chapulina chapulina deleted the chapulina/4_to_5 branch March 20, 2021 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.