Skip to content

Add missing msgs include statements#242

Merged
chapulina merged 12 commits intomainfrom
ci_matching_branch/faster_compilation
Jul 25, 2022
Merged

Add missing msgs include statements#242
chapulina merged 12 commits intomainfrom
ci_matching_branch/faster_compilation

Conversation

@scpeters
Copy link
Member

@scpeters scpeters commented Jun 30, 2022

🦟 Bug fix

Needed by gazebosim/gz-transport#315

Summary

It turns out that gz-transport has been including gz/msgs.hh from a public header, so many downstream packages may be implicitly using the msgs header files without explicitly including them. That is certainly the case for gz-sensors. As such, merging gazebosim/gz-transport#315 would break any downstream packages without explicit include statements.

This pull request uses a neat trick enabled by gazebo-tooling/release-tools#583 that allows the homebrew and windows jobs to build against the branch from gazebosim/gz-transport#315 by using the ci_matching_branch/ prefix and updating the metadata in osrf/homebrew-simulation@e08e047 and gazebo-tooling/gazebodistro@7cbdc43 accordingly. I expect the windows and homebrew CI to fail as of 6cce43a because there are still several missing include statements, though Ubuntu CI should pass since it is not as easy to instruct it to use a custom branch of a dependency. I will mark this ready for review once it is passing CI. This is ready for review.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

mjcarroll and others added 8 commits June 27, 2022 13:27
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@codecov
Copy link

codecov bot commented Jun 30, 2022

Codecov Report

Merging #242 (80bb150) into main (9739426) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #242   +/-   ##
=======================================
  Coverage   68.58%   68.58%           
=======================================
  Files          34       34           
  Lines        3428     3428           
=======================================
  Hits         2351     2351           
  Misses       1077     1077           
Impacted Files Coverage Δ
src/AirPressureSensor.cc 86.30% <ø> (ø)
src/AltimeterSensor.cc 88.50% <ø> (ø)
src/ForceTorqueSensor.cc 80.90% <ø> (ø)
src/ImuSensor.cc 84.84% <ø> (ø)
src/Lidar.cc 72.91% <ø> (ø)
src/MagnetometerSensor.cc 88.63% <ø> (ø)
src/NavSatSensor.cc 89.90% <ø> (ø)
src/Sensor.cc 91.25% <ø> (ø)

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 9739426...80bb150. Read the comment docs.

@scpeters
Copy link
Member Author

the windows build is failing for a different reason...

@chapulina
Copy link
Contributor

I see this error in the Windows build:

C:\Jenkins\workspace\ign_sensors-pr-win\ws\ign-sensors\src\AltimeterSensor.cc(95,47): error C2039: 'Altimeter': is not a member of 'gz::msgs' [C:\Jenkins\workspace\ign_sensors-pr-win\ws\build\gz-sensors7\src\gz-sensors7-altimeter.vcxproj]

@scpeters
Copy link
Member Author

the windows build is failing for a different reason...

I see this error in the Windows build:

C:\Jenkins\workspace\ign_sensors-pr-win\ws\ign-sensors\src\AltimeterSensor.cc(95,47): error C2039: 'Altimeter': is not a member of 'gz::msgs' [C:\Jenkins\workspace\ign_sensors-pr-win\ws\build\gz-sensors7\src\gz-sensors7-altimeter.vcxproj]

sorry I forgot to update. the following build failed for a different reason:

after a quick fix by @methylDragon in gazebo-tooling/release-tools#760, it is now failing as expected

@mjcarroll
Copy link
Contributor

failing as expected

I wasn't expecting this, seems stange:

C:\Jenkins\workspace\ign_sensors-pr-win\ws\ign-sensors\src\Lidar.cc(41,21): error C2039: 'LaserScan': is not a member of 'gz::msgs' [C:\Jenkins\workspace\ign_sensors-pr-win\ws\build\gz-sensors7\src\gz-sensors7-lidar.vcxproj]

C:\Jenkins\workspace\ign_sensors-pr-win\ws\install\gz-msgs9\include\ignition\msgs9\gz/msgs/empty.pb.h(78): message : see declaration of 'gz::msgs' [C:\Jenkins\workspace\ign_sensors-pr-win\ws\build\gz-sensors7\src\gz-sensors7-lidar.vcxproj]

C:\Jenkins\workspace\ign_sensors-pr-win\ws\ign-sensors\src\Lidar.cc(41,31): error C3646: 'laserMsg': unknown override specifier [C:\Jenkins\workspace\ign_sensors-pr-win\ws\build\gz-sensors7\src\gz-sensors7-lidar.vcxproj]

@mjcarroll
Copy link
Contributor

Ah, I just saw you hadn't merged in my branch, so I did so.

Signed-off-by: Michael Carroll <michael@openrobotics.org>
@scpeters scpeters marked this pull request as ready for review June 30, 2022 18:01
@scpeters scpeters requested a review from iche033 as a code owner June 30, 2022 18:01
@scpeters
Copy link
Member Author

thanks for fixing everything @mjcarroll; the homebrew build is passing, and the windows build just has compiler warnings, and a smaller number at that

this is ready for review

@mjcarroll
Copy link
Contributor

mjcarroll commented Jun 30, 2022 via email

@mjcarroll mjcarroll force-pushed the ci_matching_branch/faster_compilation branch from ed679a7 to 80bb150 Compare July 19, 2022 15:06
@chapulina chapulina added the bug Something isn't working label Jul 25, 2022
@chapulina chapulina merged commit a229760 into main Jul 25, 2022
@chapulina chapulina deleted the ci_matching_branch/faster_compilation branch July 25, 2022 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working 🌱 garden Ignition Garden

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants