Skip to content
This repository has been archived by the owner on Feb 3, 2025. It is now read-only.

Fix include installs #7

Merged
merged 3 commits into from
Oct 7, 2022
Merged

Fix include installs #7

merged 3 commits into from
Oct 7, 2022

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Oct 6, 2022

Signed-off-by: Nate Koenig [email protected]

The common 3.15.0 releases were failing: https://build.osrfoundation.org/job/ign-common3-debbuilder/1052/consoleFull#13926175386ea37b8d-a6d4-40ae-8431-d90c018842af.

I think this fixes the issue.

Fix include installs
e4a1d6e 
Signed-off-by: Nate Koenig <[email protected]>
@nkoenig nkoenig requested a review from j-rivero October 6, 2022 16:31
mjcarroll
mjcarroll approved these changes Oct 6, 2022
View reviewed changes
Copy link
Contributor

@mjcarroll mjcarroll left a comment

Choose a reason for hiding this comment

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

This looks correct, but would appreciate another look from @j-rivero

@j-rivero
Copy link
Contributor

j-rivero commented Oct 7, 2022

I made an alternative approach in 3ca3226. Let me try it with the failing builds before merging.

@j-rivero
Copy link
Contributor

j-rivero commented Oct 7, 2022 •
edited
Loading

https://build.osrfoundation.org/job/ign-common3-debbuilder/1053/console. Builds but it complains about:

dh_missing: warning: usr/include/ignition/common3/CMakeLists.txt exists in debian/tmp but is not installed to anywhere

This seems like a bug to me in the build system but it is perfectly fine not to package that file. I added a workaround 82a9b1c to avoid the unstable state.

@j-rivero
Copy link
Contributor

j-rivero commented Oct 7, 2022

Testing Build Status

@nkoenig
Copy link
Contributor Author

nkoenig commented Oct 7, 2022

Thanks Jose. The build is passing. I'll go ahead and merge this.

@nkoenig nkoenig merged commit 18956b8 into main Oct 7, 2022
@scpeters scpeters deleted the fix_detail_install branch October 7, 2022 20:20
@scpeters scpeters restored the fix_detail_install branch October 7, 2022 20:20
@scpeters
Copy link
Contributor

scpeters commented Oct 7, 2022

https://build.osrfoundation.org/job/ign-common3-debbuilder/1053/console. Builds but it complains about:

dh_missing: warning: usr/include/ignition/common3/CMakeLists.txt exists in debian/tmp but is not installed to anywhere

This seems like a bug to me in the build system but it is perfectly fine not to package that file. I added a workaround 82a9b1c to avoid the unstable state.

upstream fix in gazebosim/gz-common#449

@scpeters scpeters deleted the fix_detail_install branch October 7, 2022 22:27
@scpeters
Copy link
Contributor

scpeters commented Oct 7, 2022

a bigger problem:

dpkg: error processing archive /tmp/apt-dpkg-install-nVDKGs/554-libignition-common3-events-dev_3.15.0-1~bionic_amd64.deb (--unpack):
 trying to overwrite '/usr/include/ignition/common3/gz/common/events.hh', which is also in package libignition-common3-core-dev:amd64 3.15.0-1~bionic

Build Status https://build.osrfoundation.org/job/gazebo-ci-pr_any-ubuntu_auto-amd64-gpu-nvidia/1043/

@scpeters
Copy link
Contributor

scpeters commented Oct 7, 2022

from Build Status https://build.osrfoundation.org/job/ign-common3-debbuilder/1055/

W: ignition-common3 source: binaries-have-file-conflict libignition-common3-av-dev libignition-common3-core-dev usr/include/ignition/common3/gz/common/av.hh
W: ignition-common3 source: binaries-have-file-conflict libignition-common3-core-dev libignition-common3-events-dev usr/include/ignition/common3/gz/common/events.hh
W: ignition-common3 source: binaries-have-file-conflict libignition-common3-core-dev libignition-common3-graphics-dev usr/include/ignition/common3/gz/common/graphics.hh

@scpeters
Copy link
Contributor

scpeters commented Oct 7, 2022

follow-up fix in #8

mjcarroll added a commit to gazebo-release/gz-common4-release that referenced this pull request Oct 12, 2022
@mjcarroll
Fix include installs
d831082 
Ported from ign-common3: gazebo-release/gz-common3-release#7

Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll mjcarroll mentioned this pull request Oct 12, 2022
Merged
scpeters pushed a commit to gazebo-release/gz-common4-release that referenced this pull request Oct 12, 2022
@mjcarroll
Port ign-common3 fixes to ign-common4 (#16)
6f1ee00 
* Fix include installs

Ported from ign-common3: gazebo-release/gz-common3-release#7

* rules: fix conflicts with gz header files

Ported from gazebo-release/gz-common3-release#8

Signed-off-by: Michael Carroll <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mjcarroll mjcarroll mjcarroll approved these changes

@j-rivero j-rivero Awaiting requested review from j-rivero

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nkoenig @j-rivero @scpeters @mjcarroll