Update Lyrical rosdistro snapshot

.github/workflows/testpr.yml

@@ -77,11 +77,17 @@ jobs:
       run: |
         mkdir -p recipes
         pixi run -v vinca --platform ${{ matrix.platform }} -m -n
+        # Avoid concurrent Git clone cache corruption when many ROS packages
+        # share the same release repository.
+        pixi run python use_github_source_archives.py
 
     - name: Check patches
       shell: bash -l {0}
       run: |
-        pixi run check-patches
+        # Recipes were already generated for the matrix platform and their Git
+        # sources converted to archives. Do not use the Pixi task here because
+        # its generate-recipes dependency would overwrite both changes.
+        pixi run python check_patches_clean_apply.py
 
     - name: Restore build cache
       id: cache-restore
@@ -115,6 +121,44 @@ jobs:
     - name: Build recipes
       shell: bash -l {0}
       run: |
+        if [[ "${IGNORE_CACHE_AND_DO_FULL_REBUILD}" == "true" ]]; then
+          # Runtime-only dependencies are not part of rattler-build's build
+          # ordering. Build in tolerant passes so those packages are present
+          # under the new mutex before the final strict pass. Resetting only
+          # the Git source cache also works around intermittent incomplete tag
+          # objects when many packages share one ROS release repository.
+          for pass in 1 2 3 4; do
+            echo "Full rebuild pass ${pass}"
+            rm -rf ${{ matrix.folder_cache }}/../src_cache/git
+            pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://prefix.dev/conda-forge -c https://prefix.dev/robostack-lyrical --continue-on-failure --skip-existing
+          done
+          rm -rf ${{ matrix.folder_cache }}/../src_cache/git
+        fi
+
+        # Bootstrap packages that are hidden behind runtime-only dependency
+        # cycles before asking rattler-build to solve the complete recipe set.
+        for recipe in \
+          ros2-distro-mutex \
+          ros-lyrical-rosidl-default-generators \
+          ros-lyrical-type-description-interfaces \
+          ros-lyrical-test-msgs \
+          ros-lyrical-tracetools \
+          ros-lyrical-rcl \
+          ros-lyrical-rmw-fastrtps-cpp \
+          ros-lyrical-rmw-fastrtps-dynamic-cpp \
+          ros-lyrical-rmw-zenoh-cpp \
+          ros-lyrical-rmw-implementation \
+          ros-lyrical-rcl-action \
+          ros-lyrical-rcl-lifecycle \
+          ros-lyrical-rclcpp \
+          ros-lyrical-rclcpp-lifecycle \
+          ros-lyrical-rclpy \
+          ros-lyrical-sensor-msgs \
+          ros-lyrical-image-transport \
+          ros-lyrical-zstd-image-transport; do
+          pixi run rattler-build build --recipe "recipes/${recipe}/recipe.yaml" --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://prefix.dev/conda-forge -c https://prefix.dev/robostack-lyrical --skip-existing
+        done
+
         pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://prefix.dev/conda-forge -c https://prefix.dev/robostack-lyrical --skip-existing
 
     - name: See packages that will be saved in cache

check_patches_clean_apply.py

@@ -189,6 +189,12 @@ def run_rattler_build_individually(recipes: List[Path]) -> None:
         print("\n Running:", " ".join(cmd), "\n", flush=True)
         try:
             proc = subprocess.run(cmd, text=True, capture_output=True, errors="replace", encoding="utf-8")
+            # rattler-build's shared Git source cache can occasionally retain
+            # tag refs whose objects were not fetched. Retry from a clean Git
+            # cache rather than reporting a spurious patch failure.
+            if proc.returncode != 0 and "Git error: Git fetch failed" in proc.stderr:
+                shutil.rmtree(ROOT_DIR / "output" / "src_cache" / "git", ignore_errors=True)
+                proc = subprocess.run(cmd, text=True, capture_output=True, errors="replace", encoding="utf-8")
             success = proc.returncode == 0
             results.append(
                 {

conda_build_config.yaml

@@ -28,15 +28,15 @@ graphviz:
 # Mitigation for
 # https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380
 libcap:
-  - 2.77
+  - 2.78
 fmt:
   - 12.1
 lua:
   - 5.4
 tbb:
-  - '2022'
+  - '2023'
 tbb_devel:
-  - '2022'
+  - '2023'
 
 # Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
 cmake:
@@ -60,7 +60,7 @@ c_compiler:
   - vs2022                     # [win]
 c_compiler_version:            # [unix]
   - 14                         # [linux]
-  - 18                         # [osx]
+  - 19                         # [osx]
 c_stdlib:
   - sysroot                    # [linux]
   - macosx_deployment_target   # [osx]
@@ -75,12 +75,12 @@ cxx_compiler:
   - vs2022                     # [win]
 cxx_compiler_version:          # [unix]
   - 14                         # [linux]
-  - 18                         # [osx]
+  - 19                         # [osx]
 
 libzenohc:
   - 1.9.0
 libzenohcxx:
   - 1.9.0
 
 libhwloc:
-  - 2.12.2
+  - 2.13.0

patch/dependencies.yaml

@@ -49,9 +49,6 @@ rmf_visualization_schedule:
 rmf_fleet_adapter:
   add_host: ["eigen-abi-devel"]
   remove_host: ["eigen"]
-rmf_websocket:
-  add_host: ["asio", "websocketpp"]
-  add_run: ["asio", "websocketpp"]
 behaviortree_cpp:
   add_host: ["libboost-devel", "cppzmq", "zeromq", "sqlite"]
   add_run: ["libboost"]
@@ -166,6 +163,19 @@ force_torque_sensor_broadcaster:
   add_host: ["typeguard", "jinja2"]
 ros_gz_sim:
   add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "ros-lyrical-gz-sensors-vendor"]
+ament_cmake_ros:
+  # Break the test-only runtime cycle so a new mutex migration can bootstrap.
+  remove_run: ["ros-lyrical-rmw-test-fixture-implementation"]
+cyclonedds:
+  add_host: ["libiceoryx-hoofs-devel", "libiceoryx-posh-devel"]
+  add_run: ["libiceoryx-hoofs", "libiceoryx-posh"]
+  remove_host: ["ros-lyrical-iceoryx-hoofs", "ros-lyrical-iceoryx-posh"]
+  remove_run: ["ros-lyrical-iceoryx-hoofs", "ros-lyrical-iceoryx-posh"]
+rmw_cyclonedds_cpp:
+  add_host: ["libiceoryx-binding-c-devel"]
+  add_run: ["libiceoryx-binding-c"]
+  remove_host: ["ros-lyrical-iceoryx-binding-c"]
+  remove_run: ["ros-lyrical-iceoryx-binding-c"]
 geometric_shapes:
   add_host: ["libboost-devel", "octomap"]
 ros_image_to_qimage:
@@ -174,7 +184,10 @@ rqt_image_overlay:
   add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
 slam_toolbox:
   add_build: ["${{ 'qt6-main' if (build_platform != target_platform) }}"]
-  add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "blas-devel", "ceres-solver * cpu*"]
+  add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}", "blas-devel", "ceres-solver * cpu*", "qt6-main"]
+  add_run: ["qt6-main"]
+  remove_host: ["qt-main"]
+  remove_run: ["qt-main"]
 vision_msgs_rviz_plugins:
   add_build: ["${{ 'qt6-main' if (build_platform != target_platform) }}"]
   add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
@@ -277,6 +290,11 @@ autoware_behavior_velocity_planner_common:
   add_host: ["cpp-expected"]
 autoware_behavior_velocity_stop_line_module:
   add_host: ["cpp-expected"]
+rcl:
+  # rmw_implementation is a test-only host dependency here, but it depends on
+  # concrete RMW backends. Removing it breaks the mutex-migration bootstrap
+  # cycle while retaining the runtime dependency.
+  remove_host: ["ros-lyrical-rmw-implementation"]
 rclpy:
   add_host: ["typing_extensions"]
   add_run: ["typing_extensions"]
@@ -298,7 +316,7 @@ grid_map_octomap:
   add_host: ["octomap"]
   add_run: ["octomap"]
 py_trees:
-  add_host: ["poetry-core"]
+  add_host: ["hatchling"]
 py_trees_js:
   add_host: ["poetry-core"]
 py_trees_ros: