Skip to content

Conversation

@amadeuszsz
Copy link
Contributor

@amadeuszsz amadeuszsz commented Jan 8, 2026

Description

  • Add jazzy distro support.
  • Keep compatibility with humble distro.

Related links

Tests performed

Notes for reviewers

Before merge we need to restore links to the upstream in Dockerfile and repos files.

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

  • The PR follows the pull request guidelines.
  • The PR has been properly tested.
  • The PR has been reviewed by the code owners.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.
  • The PR is ready for merge.

After all checkboxes are checked, anyone who has write access can merge the PR.

Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
@amadeuszsz amadeuszsz self-assigned this Jan 8, 2026
pre-commit-ci bot and others added 4 commits January 8, 2026 04:40
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
@codecov-commenter
Copy link

codecov-commenter commented Jan 8, 2026

Codecov Report

❌ Patch coverage is 0% with 71 lines in your changes missing coverage. Please review.
✅ Project coverage is 0.06%. Comparing base (bab5400) to head (d5d2183).
⚠️ Report is 101 commits behind head on tier4/universe.

Files with missing lines Patch % Lines
common/tier4_tag_utils/src/lidartag_hypothesis.cpp 0.00% 12 Missing ⚠️
...based_pnp_calibrator/src/calibration_estimator.cpp 0.00% 10 Missing ⚠️
common/tier4_tag_utils/src/apriltag_hypothesis.cpp 0.00% 9 Missing ⚠️
..._based_calibrator/src/mapping_based_calibrator.cpp 0.00% 8 Missing ⚠️
...r/intrinsic_camera_calibrator/camera_calibrator.py 0.00% 6 Missing ⚠️
...r_calibrator/src/marker_radar_lidar_calibrator.cpp 0.00% 5 Missing ⚠️
...librator/src/ceres_camera_intrinsics_optimizer.cpp 0.00% 2 Missing ⚠️
...rator/src/ceres_intrinsic_camera_calibrator_py.cpp 0.00% 2 Missing ⚠️
...ased_calibrator/src/filters/best_frames_filter.cpp 0.00% 2 Missing ⚠️
...g_based_calibrator/src/filters/dynamics_filter.cpp 0.00% 2 Missing ⚠️
... and 11 more
Additional details and impacted files
@@                Coverage Diff                @@
##           tier4/universe    #276      +/-   ##
=================================================
- Coverage            0.93%   0.06%   -0.88%     
=================================================
  Files                 270      97     -173     
  Lines               21339   10522   -10817     
  Branches              383    1085     +702     
=================================================
- Hits                  200       7     -193     
+ Misses              20982   10515   -10467     
+ Partials              157       0     -157     
Flag Coverage Δ
differential 0.06% <0.00%> (?)
total ?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

amadeuszsz and others added 3 commits January 9, 2026 15:17
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
Comment on lines 4 to 5
url: https://github.com/amadeuszsz/CalibrationTools.git # TODO: restore upstream
version: feat/jazzy-support # TODO: restore tier4/universe branch
Copy link
Contributor

Choose a reason for hiding this comment

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

reminder: restore before merge

Comment on lines 4 to 5
url: https://github.com/amadeuszsz/CalibrationTools.git # TODO: restore upstream
version: feat/jazzy-support # TODO: restore tier4/universe branch
Copy link
Contributor

Choose a reason for hiding this comment

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

reminder: restore before merge

Comment on lines 18 to 19
# TODO: restore upstream
RUN wget https://raw.githubusercontent.com/amadeuszsz/CalibrationTools/feat/jazzy-support/calibration_tools_standalone.repos --directory-prefix=/workspace
Copy link
Contributor

Choose a reason for hiding this comment

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

reminder: restore before merge

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This pull request adds support for ROS 2 Jazzy distribution while maintaining backward compatibility with ROS 2 Humble. The implementation uses version-based conditional compilation to handle API differences between the two distributions.

Key Changes:

  • Version-based conditional compilation for header files that changed from .h to .hpp extensions (image_geometry, cv_bridge)
  • Service QoS handling updated to use rclcpp::ServicesQoS() for Jazzy
  • Type safety improvements (size_t comparisons, array initialization)
  • Updated dependency versions in .repos files
  • Docker build configuration now supports both distros via build arguments
  • CI/CD workflows updated to test both Humble and Jazzy

Reviewed changes

Copilot reviewed 33 out of 33 changed files in this pull request and generated 13 comments.

Show a summary per file
File Description
docs/tutorials/tag_based_pnp_calibrator.md Updated autoware documentation URL path
docs/tutorials/marker_radar_lidar_calibrator.md Updated autoware documentation URL path
docs/tutorials/mapping_based_calibrator.md Updated autoware documentation URL path
docker/Dockerfile Added ARG for ROS_DISTRO, updated to support both Humble and Jazzy
common/tier4_tag_utils/src/apriltag_filter.cpp Added version-based conditional includes for image_geometry
common/tier4_tag_utils/include/tier4_tag_utils/apriltag_hypothesis.hpp Added version-based conditional includes for image_geometry
common/tier4_calibration_pcl_extensions/include/tier4_calibration_pcl_extensions/joint_icp_extended_impl.hpp Fixed type comparison to use size_t consistently
calibrators/tag_based_sfm_calibrator/src/tag_based_sfm_calibrator.cpp Added SERVICE_QOS macro for version compatibility
calibrators/tag_based_sfm_calibrator/src/ceres/calibration_problem.cpp Added version-based conditional includes for cv_bridge
calibrators/tag_based_sfm_calibrator/include/tag_based_sfm_calibrator/ceres/camera_residual.hpp Fixed uninitialized array with empty initializer
calibrators/tag_based_sfm_calibrator/CMakeLists.txt Added compiler warning suppressions
calibrators/tag_based_pnp_calibrator/src/tag_based_pnp_calibrator.cpp Added version-based conditional includes and SERVICE_QOS macro
calibrators/tag_based_pnp_calibrator/include/tag_based_pnp_calibrator/tag_calibrator_visualizer.hpp Added version-based conditional includes for image_geometry
calibrators/tag_based_pnp_calibrator/include/tag_based_pnp_calibrator/calibration_estimator.hpp Added version-based conditional includes for image_geometry
calibrators/tag_based_pnp_calibrator/CMakeLists.txt Added compiler warning suppressions and include directories
calibrators/marker_radar_lidar_calibrator/src/marker_radar_lidar_calibrator.cpp Added SERVICE_QOS macro for version compatibility
calibrators/mapping_based_calibrator/src/mapping_based_calibrator.cpp Added SERVICE_QOS macro for version compatibility
calibrators/mapping_based_calibrator/src/camera_calibrator.cpp Added version-based conditional includes for image_geometry
calibrators/mapping_based_calibrator/CMakeLists.txt Added compiler warning suppressions
calibrators/lidar_to_lidar_2d_calibrator/src/lidar_to_lidar_2d_calibrator.cpp Added SERVICE_QOS macro for version compatibility
calibrators/lidar_to_lidar_2d_calibrator/CMakeLists.txt Added compiler warning suppressions
calibrators/intrinsic_camera_calibrator/ceres_intrinsic_camera_calibrator/include/ceres_intrinsic_camera_calibrator/fov_residual.hpp Changed ceres::IsNaN to ceres::isnan for compatibility
calibrators/ground_plane_calibrator/src/ground_plane_calibrator.cpp Added SERVICE_QOS macro for version compatibility
calibration_tools_standalone.repos Updated dependency versions for Jazzy, temporary fork references
calibration_tools_autoware.repos Updated dependency versions for Jazzy, temporary fork references
build_depends.repos Fixed autoware.universe URL and updated dependency versions
README.md Updated supported distros and Docker build instructions
.github/workflows/sync-tier4-universe-to-jazzy.yml Added new workflow for syncing tier4/universe to jazzy branch
.github/workflows/check-build-depends.yaml Added Jazzy to test matrix
.github/workflows/build-and-test.yaml Added Jazzy to test matrix
.github/workflows/build-and-test-differential.yaml Added Jazzy to test matrix
.github/sync-files.yaml Removed autoware_common sync (managing workflows manually)
.cspell.json Added "stringop" to dictionary

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@paulsohn
Copy link
Contributor

paulsohn commented Jan 10, 2026

@amadeuszsz please leave a proper response for copilot comments before marking resolved.
I see most of them are trivial, but the decency for considering every possible concerns and resolving them in traceable form would be beneficial unless we do 100% formal verification.

Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
@amadeuszsz amadeuszsz added the run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Jan 13, 2026
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
amadeuszsz and others added 4 commits January 13, 2026 11:36
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
Signed-off-by: Amadeusz Szymko <amadeusz.szymko.2@tier4.jp>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants