diff --git a/.github/workflows/ros_ci.yml b/.github/workflows/ros_ci.yml index a2e843bf42f42d43912626822332cfba377d3ab4..b70dbf3114bbde80a0c330cf1f0340d9662aa942 100644 --- a/.github/workflows/ros_ci.yml +++ b/.github/workflows/ros_ci.yml @@ -32,26 +32,23 @@ jobs: strategy: matrix: env: + # ROS1 - {ROS_DISTRO: noetic} + # ROS2 - {ROS_DISTRO: iron} - {ROS_DISTRO: humble} + - {ROS_DISTRO: jazzy} - {ROS_DISTRO: rolling} env: - # CCACHE_DIR: /home/runner/.ccache # Enable ccache - PRERELEASE: true + # PRERELEASE: true # Fails due to issues in the underlying Docker image BUILDER: colcon runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - # This step will fetch/store the directory used by ccache before/after the ci run - # - uses: actions/cache@v3 - # with: - # path: ${{ env.CCACHE_DIR }} - # key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} # Run industrial_ci - - uses: 'ros-industrial/industrial_ci@9f963f67ebb889792175776c5ee00134d7bb569b' + - uses: 'ros-industrial/industrial_ci@875c2aebfd634eebaa84dbe5198f2fdb4c5f1b7e' env: ${{ matrix.env }} check: diff --git a/package.xml b/package.xml index dddafda7b44fe3a9f8fde9003f640c4de0148649..d1698f326d7e0fe453692f6cd9c15755b8e4c334 100644 --- a/package.xml +++ b/package.xml @@ -20,7 +20,9 @@ <depend condition="$ROS_PYTHON_VERSION == 2">python</depend> <depend condition="$ROS_PYTHON_VERSION == 3">python3</depend> <depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</depend> + <depend condition="$ROS_PYTHON_VERSION == 2">python-scipy</depend> <depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</depend> + <depend condition="$ROS_PYTHON_VERSION == 3">python3-scipy</depend> <depend>eigen</depend> <depend>boost</depend>