Merge pull request #23 from wep21/rebuild-202506

rebuild for 202506

Author: traversaro

.github/workflows/testpr.yml

@@ -54,94 +54,32 @@ jobs:
         rm -rf /c/Strawberry
         rm -rf "/c/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/"
 
-
     # Regression for https://github.com/RoboStack/ros-jazzy/issues/44
     - name: Check that anaconda-client command works fine
       shell: bash -l {0}
       run: |
         pixi run anaconda --version
 
-    - name: Generate recipes for linux-64
-      shell: bash -l {0}
-      if: matrix.platform == 'linux-64'
-      run: |
-        mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -v vinca --platform linux-64 -m -n
-        ls -la recipes
-    - name: Generate recipes for linux-aarch64
-      shell: bash -l {0}
-      if: matrix.platform == 'linux-aarch64'
-      run: |
-        mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -v vinca --platform linux-aarch64 -m -n
-        ls -la recipes
-    - name: Generate recipes for osx-64
-      shell: bash -l {0}
-      if: matrix.platform == 'osx-64'
-      run: |
-        mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -v vinca --platform osx-64 -m -n
-        ls -la recipes
-    - name: Generate recipes for osx-arm64
-      shell: bash -l {0}
-      if: matrix.platform == 'osx-arm64'
-      run: |
-        mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -v vinca --platform osx-arm64 -m -n
-        ls -la recipes
-    - name: Generate recipes for win-64
+    - name: Long paths workarounds for win-64
       shell: bash -l {0}
       if: matrix.platform == 'win-64'
       run: |
         # Workaround for problem related to long paths
         echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
         mkdir /c/bld
-        mkdir -p recipes
-        $HOME/.pixi/bin/pixi run -v vinca --platform win-64 -m -n
-        ls -la recipes
-    - name: Check if there are packages to be built
-      id: newrecipecheck
-      shell: bash -l {0}
-      run: |
-        # Workaround for https://github.com/prefix-dev/rattler-build/issues/1535
-        set +e
-        if [ ! -d recipes ] || [ -z "$(ls -A recipes)" ]; then
-          echo "RECIPE_CREATED=0" >> $GITHUB_OUTPUT
-        else
-          echo "RECIPE_CREATED=1" >> $GITHUB_OUTPUT
-        fi
-    - name: Build recipes for linux-64
-      shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-64'
-      run: |
-        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py 
-        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-    - name: Build recipes for linux-aarch64
-      shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'linux-aarch64'
-      run: |
-        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
-        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-    - name: Build recipes for osx-64
+
+    - name: Generate recipes
       shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
-        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-    - name: Build recipes for osx-arm64
+        mkdir -p recipes
+        pixi run -v vinca --platform ${{ matrix.platform }} -m -n
+
+    - name: Check patches
       shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'osx-arm64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
-        # env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-        env -i $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-    - name: Build recipes for win-64
+        pixi run python check_patches_clean_apply.py
+
+    - name: Build recipes
       shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && matrix.platform == 'win-64'
       run: |
-        $HOME/.pixi/bin/pixi run python check_patches_clean_apply.py
-        # $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir additional_recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
-        $HOME/.pixi/bin/pixi run rattler-build build --recipe-dir recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing
+        pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c robostack-kilted -c conda-forge --skip-existing

additional_recipes/ros-kilted-octomap/recipe.yaml

@@ -12,6 +12,8 @@ libopencv:
   - 4.11.0
 libxml2:
   - 2.13.*
+graphviz:
+  - 12.*
 
 # Workaround for https://github.com/RoboStack/ros-kilted/pull/40#issuecomment-2782226697
 cmake:
@@ -49,8 +51,8 @@ cxx_compiler_version:          # [unix]
   - 18                         # [osx]
 
 libzenohc:
-  - 1.3.4
+  - 1.4.0
 libzenohcxx:
-  - 1.3.4
+  - 1.4.0
 libcap:
   - 2.71

additional_recipes/ros-kilted-urdfdom-headers/recipe.yaml

@@ -89,7 +89,7 @@ popf:
 rtabmap:
   add_host: ["REQUIRE_OPENGL", "ceres-solver", "libdc1394", "libusb", "vtk"]
 backward_ros:
-  add_host: ["${{ 'binutils' if linux or (osx and x86_64) }}", "${{ 'elfutils' if linux }}", "ros-kilted-ament-cmake-libraries"]
+  add_host: ["${{ 'binutils' if linux }}", "${{ 'elfutils' if linux }}", "ros-kilted-ament-cmake-libraries"]
 nav2_smac_planner:
   add_build: ["${{ 'llvm-openmp' if osx }}"]
   add_host: ["${{ 'llvm-openmp' if osx }}", "ompl", "libode"]
@@ -252,9 +252,9 @@ rclpy:
   add_run: ["typing_extensions"]
 image_tools:
   # Depends on opencv with gui support, see https://github.com/ros2/demos/blob/8f361a1ece2daae54016959f3ea9ab2e7692ddbb/image_tools/src/showimage.cpp#L190
-  add_run: ["${{ 'libopencv * *qt6*' if not (ppc64le or aarch64 or osx) }}"]
+  add_run: ["libopencv * *qt6*"] 
 camera_calibration:
   # Depends on opencv with gui support, see https://github.com/ros-perception/image_pipeline/blob/746268fcfd21b389bc39ae60bb6345a53c838558/camera_calibration/src/camera_calibration/camera_calibrator.py#L286
-  add_run: ["${{ 'libopencv * *qt6*' if not (ppc64le or aarch64 or osx) }}"]
+  add_run: ["libopencv * *qt6*"]
 livox_ros_driver2:
   add_host: ["livox-sdk2"]