Skip to content

Commit 5464c48

Browse files
authored
Merge pull request #472 from wxmerkt/topic/fix-ros-ci
Fix ROS CI & compilation
2 parents 3ab149b + d17da2e commit 5464c48

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/ros_ci.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,23 @@ jobs:
3232
strategy:
3333
matrix:
3434
env:
35+
# ROS1
3536
- {ROS_DISTRO: noetic}
37+
# ROS2
3638
- {ROS_DISTRO: iron}
3739
- {ROS_DISTRO: humble}
40+
- {ROS_DISTRO: jazzy}
3841
- {ROS_DISTRO: rolling}
3942
env:
40-
# CCACHE_DIR: /home/runner/.ccache # Enable ccache
41-
PRERELEASE: true
43+
# PRERELEASE: true # Fails due to issues in the underlying Docker image
4244
BUILDER: colcon
4345
runs-on: ubuntu-latest
4446
steps:
45-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
4648
with:
4749
submodules: recursive
48-
# This step will fetch/store the directory used by ccache before/after the ci run
49-
# - uses: actions/cache@v3
50-
# with:
51-
# path: ${{ env.CCACHE_DIR }}
52-
# key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
5350
# Run industrial_ci
54-
- uses: 'ros-industrial/industrial_ci@9f963f67ebb889792175776c5ee00134d7bb569b'
51+
- uses: 'ros-industrial/industrial_ci@875c2aebfd634eebaa84dbe5198f2fdb4c5f1b7e'
5552
env: ${{ matrix.env }}
5653

5754
check:

package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<depend condition="$ROS_PYTHON_VERSION == 2">python</depend>
2121
<depend condition="$ROS_PYTHON_VERSION == 3">python3</depend>
2222
<depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</depend>
23+
<depend condition="$ROS_PYTHON_VERSION == 2">python-scipy</depend>
2324
<depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</depend>
25+
<depend condition="$ROS_PYTHON_VERSION == 3">python3-scipy</depend>
2426
<depend>eigen</depend>
2527
<depend>boost</depend>
2628

0 commit comments

Comments
 (0)