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

Port: 4 to 5 #511

Merged
merged 5 commits into from
May 22, 2023
Merged

Port: 4 to 5 #511

merged 5 commits into from
May 22, 2023

Conversation

mjcarroll
Copy link
Contributor

➡️ Forward port

Port ign-common4 to gz-common5

Branch comparison: gz-common5...ign-common4

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

scpeters and others added 2 commits May 17, 2023 16:14
@scpeters @mjcarroll
Fix build error when using gz:: with ign-common4 (#489)
c7827f3 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Michael Carroll <mjcarroll@intrinsic.ai>
@mjcarroll
🎈 4.7.0 (#510)
60b1fdd 
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@mjcarroll mjcarroll requested a review from marcoag as a code owner May 18, 2023 21:12
@mjcarroll mjcarroll changed the title Port/4 to 5 Port: 4 to 5 May 18, 2023
@github-actions github-actions bot added 🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic labels May 18, 2023
@codecov
Copy link

codecov bot commented May 18, 2023 •
edited
Loading

Codecov Report

Merging #511 (60b1fdd) into gz-common5 (f131cfa) will decrease coverage by 0.82%.
The diff coverage is n/a.

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

@@              Coverage Diff               @@
##           gz-common5     #511      +/-   ##
==============================================
- Coverage       83.67%   82.86%   -0.82%     
==============================================
  Files              90       75      -15     
  Lines           10247     9558     -689     
==============================================
- Hits             8574     7920     -654     
+ Misses           1673     1638      -35
Impacted Files Coverage Δ
graphics/include/gz/common/HeightmapData.hh 100.00% <ø> (ø)
graphics/include/gz/common/Image.hh 97.05% <ø> (ø)
graphics/include/gz/common/ImageHeightmap.hh 88.88% <ø> (ø)
graphics/include/gz/common/MeshLoader.hh 100.00% <ø> (ø)
graphics/include/gz/common/NodeTransform.hh 100.00% <ø> (ø)
graphics/include/gz/common/SVGLoader.hh 100.00% <ø> (ø)
include/gz/common/EnumIface.hh 100.00% <ø> (ø)
include/gz/common/Filesystem.hh 100.00% <ø> (ø)
include/gz/common/FlagSet.hh 95.40% <ø> (ø)
include/gz/common/MovingWindowFilter.hh 100.00% <ø> (ø)
... and 6 more

... and 63 files with indirect coverage changes

scpeters
scpeters reviewed May 18, 2023
View reviewed changes
Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the gz/common/config.hh includes are not universally needed in Garden. They were just needed in citadel and fortress. If we want to keep fewer includes, we could revert them from this merge-forward, but if we don't care then we can keep them

@mjcarroll
Copy link
Contributor Author

I think the gz/common/config.hh includes are not universally needed in Garden. They were just needed in citadel and fortress. If we want to keep fewer includes, we could revert them from this merge-forward, but if we don't care then we can keep them

True, I will remove them

@mjcarroll
Merge remote-tracking branch 'origin/ign-common4' into port/4_to_5
014e95e 
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@mjcarroll
Fix missing headers
9266513 
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@mjcarroll mjcarroll force-pushed the port/4_to_5 branch 3 times, most recently from d20cdca to 1254728 Compare May 22, 2023 15:21
@mjcarroll
Lint
a7d01a8 
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@mjcarroll mjcarroll merged commit f96e361 into gz-common5 May 22, 2023
@mjcarroll mjcarroll deleted the port/4_to_5 branch May 22, 2023 17:31
@mjcarroll mjcarroll mentioned this pull request May 22, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scpeters scpeters scpeters left review comments

@ahcorde ahcorde ahcorde approved these changes

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

Assignees
No one assigned
Labels
🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mjcarroll @ahcorde @scpeters