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

3 ➡️ 4 #328

Merged
merged 5 commits into from
May 27, 2021
Merged

3 ➡️ 4 #328

merged 5 commits into from
May 27, 2021

Conversation

mjcarroll
Copy link
Contributor

➡️ Forward port

Port ign-rendering3 to ign-rendering4

Branch comparison: ign-rendering4...ign-rendering3

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

chapulina and others added 4 commits May 14, 2021 17:59
@chapulina
Helper function to get a scene (#320)
55a35a7 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina @iche033
Remove tools/code_check and update codecov (#321)
d3eb5ca 
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Ian Chen <ichen@osrfoundation.org>
@ahcorde
Include MoveTo Helper class to ign-rendering (#311)
e14d708 
* Include MoveTo Helper class to ign-rendering

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

* make linters happy

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

* Added feedback

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

* Added MoveToHelper test

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

* Added feedback

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

* timeout as arg

Signed-off-by: ahcorde <ahcorde@gmail.com>
@mjcarroll
⬆️ 3.5.0 (#327)
fbfc382 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll mjcarroll requested a review from iche033 as a code owner May 25, 2021 16:59
@mjcarroll
Merge branch 'ign-rendering3' into ports/3_to_4_25MAY2021
85f714a 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@github-actions github-actions bot added the 🔮 dome Ignition Dome label May 25, 2021
@mjcarroll mjcarroll force-pushed the ports/3_to_4_25MAY2021 branch from 8cf2cb2 to 85f714a Compare May 25, 2021 16:59
@mjcarroll mjcarroll changed the title Ports/3 to 4 25 may2021 3 ➡️ 4 May 25, 2021
@mjcarroll mjcarroll requested a review from ahcorde May 25, 2021 17:00
@codecov
Copy link

codecov bot commented May 25, 2021 •
edited
Loading

Codecov Report

Merging #328 (f09f0de) into ign-rendering4 (63b7e12) will increase coverage by 2.29%.
The diff coverage is 77.70%.

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

@@                Coverage Diff                 @@
##           ign-rendering4     #328      +/-   ##
==================================================
+ Coverage           53.52%   55.82%   +2.29%     
==================================================
  Files                 145      147       +2     
  Lines               13776    13930     +154     
==================================================
+ Hits                 7374     7776     +402     
+ Misses               6402     6154     -248
Impacted Files Coverage Δ
ogre/src/OgreMaterial.cc 35.45% <0.00%> (+35.45%) ⬆️
src/RenderingIface.cc 71.92% <53.57%> (-17.73%) ⬇️
src/MoveToHelper.cc 90.47% <90.47%> (ø)
include/ignition/rendering/MoveToHelper.hh 100.00% <100.00%> (ø)
ogre/src/OgreRenderEngine.cc 68.46% <100.00%> (+2.60%) ⬆️
src/ShaderParam.cc 100.00% <100.00%> (ø)
ogre/src/OgreMeshFactory.cc 1.11% <0.00%> (+1.11%) ⬆️
... and 10 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 fdc3e5a...85f714a. Read the comment docs.

ahcorde
ahcorde requested changes May 25, 2021
View reviewed changes
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.

Many MACOS tests are failing https://build.osrfoundation.org/job/ignition_rendering-ci-pr_any-homebrew-amd64/1490/

DCO is failing too

@mjcarroll
Copy link
Contributor Author

@osrf-jenkins retest this please

@mjcarroll
Copy link
Contributor Author

DCO is failing too

I've always had issues with DCO on forward ports

@mjcarroll mjcarroll enabled auto-merge (squash) May 27, 2021 13:36
@mjcarroll mjcarroll disabled auto-merge May 27, 2021 13:36
@mjcarroll mjcarroll enabled auto-merge May 27, 2021 13:36
@mjcarroll mjcarroll merged commit 97891ac into ign-rendering4 May 27, 2021
@mjcarroll mjcarroll deleted the ports/3_to_4_25MAY2021 branch May 27, 2021 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@iche033 iche033 Awaiting requested review from iche033 iche033 is a code owner

Assignees
No one assigned
Labels
🔮 dome Ignition Dome
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mjcarroll @ahcorde @darksylinc @chapulina