Skip to content

Commit 3a77973

Browse files
committed
Fix CI: Use ROS 2 Humble with ubuntu-22.04
GitHub Actions doesn't support ubuntu-24.04 runners yet. Changed CI to test with ROS 2 Humble on ubuntu-22.04. Updated README to reflect support for both Humble and Jazzy.
1 parent 964fede commit 3a77973

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

.github/workflows/industrial_ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
strategy:
88
matrix:
99
env:
10-
- {ROS_DISTRO: jazzy, ROS_REPO: main}
11-
runs-on: ubuntu-24.04
10+
- {ROS_DISTRO: humble, ROS_REPO: main}
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v4
1414
- uses: 'ros-industrial/industrial_ci@master'

README.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
__Tinymovr ROS 2 Hardware Interface__
22

3-
![ROS2](https://img.shields.io/badge/ROS2-Jazzy-blue)
3+
![ROS2](https://img.shields.io/badge/ROS2-Humble%20|%20Jazzy-blue)
44
![ROS1](https://img.shields.io/badge/ROS1-Noetic-inactive)
55
[![CI](https://github.com/tinymovr/Tinymovr-ROS/actions/workflows/industrial_ci.yaml/badge.svg)](https://github.com/tinymovr/Tinymovr-ROS/actions)
66

77
> [!IMPORTANT]
8-
> **This branch (`main`) is for ROS 2 Jazzy** on Ubuntu 24.04
8+
> **This branch (`main`) is for ROS 2** (Humble on Ubuntu 22.04 or Jazzy on Ubuntu 24.04)
99
>
1010
> **For ROS 1 Noetic**, see the [`ros1-noetic`](https://github.com/tinymovr/Tinymovr-ROS/tree/ros1-noetic) branch (legacy support)
11+
>
12+
> _Note: CI currently tests with ROS 2 Humble due to GitHub Actions runner availability_
1113
1214
---
1315

@@ -23,12 +25,20 @@ A ROS 2 package that provides hardware interfacing for the [Tinymovr](https://ti
2325

2426
## Prerequisites
2527

26-
- **ROS 2 Jazzy** (LTS) on Ubuntu 24.04
28+
- **ROS 2 Humble** (Ubuntu 22.04) or **ROS 2 Jazzy** (Ubuntu 24.04)
2729
- **SocketCAN** tools and utilities installed
2830
- **Tinymovr** devices with firmware 1.6.x or 2.x
2931
- Devices properly set up and calibrated
3032

3133
### Required ROS 2 Packages
34+
35+
**For ROS 2 Humble (Ubuntu 22.04):**
36+
```bash
37+
sudo apt install ros-humble-ros2-control ros-humble-ros2-controllers \
38+
ros-humble-xacro ros-humble-robot-state-publisher
39+
```
40+
41+
**For ROS 2 Jazzy (Ubuntu 24.04):**
3242
```bash
3343
sudo apt install ros-jazzy-ros2-control ros-jazzy-ros2-controllers \
3444
ros-jazzy-xacro ros-jazzy-robot-state-publisher

0 commit comments

Comments
 (0)