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: 1 -> 2 #109

Merged
merged 6 commits into from Nov 16, 2022
Merged

port: 1 -> 2 #109

merged 6 commits into from Nov 16, 2022

Conversation

mjcarroll
Copy link
Contributor

➡️ Forward port

Port ign-plugin1 to gz-plugin2

Branch comparison: gz-plugin2...ign-plugin1

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

methylDragon and others added 4 commits August 10, 2022 21:13
@methylDragon
Remove redundant namespace references (#100)
3c08e28 
Signed-off-by: methylDragon <methylDragon@gmail.com>
@chapulina
🎈 1.3.0 (#103)
0575eda 
Signed-off-by: Louise Poubel <louise@openrobotics.org>

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@methylDragon
ign -> gz Migrate Ignition Headers : gz-plugin (#101)
e86f925 
Signed-off-by: methylDragon <methylDragon@gmail.com>
@mjcarroll
release: Prepare for 1.4.0 release (#108)
1d5a4c9 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@osrf-triage osrf-triage added this to Inbox in Core development Nov 11, 2022
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Nov 11, 2022
@codecov
Copy link

codecov bot commented Nov 11, 2022 •
edited

Codecov Report

Merging #109 (89aaaf3) into gz-plugin2 (931428a) will not change coverage.
The diff coverage is 100.00%.

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

@@             Coverage Diff             @@
##           gz-plugin2     #109   +/-   ##
===========================================
  Coverage       98.26%   98.26%           
===========================================
  Files              23       23           
  Lines             748      748           
===========================================
  Hits              735      735           
  Misses             13       13
Impacted Files Coverage Δ
loader/src/cmd/gz.cc 88.88% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Core development automation moved this from Inbox to In review Nov 11, 2022
@mjcarroll
Copy link
Contributor Author

Have there been consistent ABI checker issues here or is this something that I have introduced?

scpeters
scpeters requested changes Nov 11, 2022
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.

this has many more changes than I would have expected from a forward-port

in particular I believe the change to core/include/gz/plugin/detail/Export.hh is incorrect since that file should be auto-generated. I think @methylDragon should take a look at this

scpeters
scpeters reviewed Nov 11, 2022
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 since we have already published debs from this branch with the ignition detail headers, we shouldn't remove them now

@mjcarroll
Copy link
Contributor Author

in particular I believe the change to core/include/gz/plugin/detail/Export.hh is incorrect since that file should be auto-generated.

I removed it, that is what was causing the issue with the ABI checker.

@mjcarroll mjcarroll force-pushed the ports/1_to_2 branch 2 times, most recently from 106fa08 to 3b1dd2b Compare November 11, 2022 18:15
@mjcarroll
Merge branch 'ign-plugin1' into ports/1_to_2
0004b06 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Copy link
Contributor Author

I think since we have already published debs from this branch with the ignition detail headers, we shouldn't remove them now

Restored.

@mjcarroll
Copy link
Contributor Author

this has many more changes than I would have expected from a forward-port

The remaining diff is mostly copyright years, I'm not sure what the best way to handle these is? Just bring them all up to 2022?

scpeters
scpeters reviewed Nov 15, 2022
View reviewed changes
core/include/CMakeLists.txt Outdated Show resolved Hide resolved
loader/include/CMakeLists.txt Outdated Show resolved Hide resolved
register/include/CMakeLists.txt Outdated Show resolved Hide resolved
@mjcarroll
Remove redundant CMakeLists
d18c9dd 
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@nkoenig
Copy link
Contributor

nkoenig commented Nov 16, 2022

We don't need to constantly update the copyright year in each file.. This looks fine.

@nkoenig nkoenig merged commit 73de1cd into gz-plugin2 Nov 16, 2022
Core development automation moved this from In review to Done Nov 16, 2022
@nkoenig nkoenig deleted the ports/1_to_2 branch November 16, 2022 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scpeters scpeters scpeters requested changes

@nkoenig nkoenig nkoenig approved these changes

@ahcorde ahcorde ahcorde approved these changes

@mxgrey mxgrey Awaiting requested review from mxgrey

Assignees
No one assigned
Labels
🌱 garden Ignition Garden
Projects
Core development
Archived in project
Core development
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@mjcarroll @nkoenig @ahcorde @scpeters @methylDragon @chapulina