Skip to content

Commit 5430e46

Browse files
committed
refactor: remove EOL Iron distro, keep rostooling CI images
- Remove all Iron (EOL) references from code and documentation - Add Config::kilted() method for Kilted distro support - Keep rostooling CI images (work out of the box for GitHub Actions) Iron reached End of Life. Official ros: Docker images lack CI tooling (bash, proper user setup) required by GitHub Actions. rostooling images pull the same ROS packages but include all necessary CI tools.
1 parent 3bdb04a commit 5430e46

File tree

11 files changed

+18
-30
lines changed

11 files changed

+18
-30
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- distro: jazzy
4242
image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
4343
- distro: kilted
44-
image: ros:kilted-ros-base
44+
image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest
4545
container:
4646
image: ${{ matrix.image }}
4747
steps:

book/src/chapters/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ The build system automatically locates ROS message definitions:
156156
**Search order:**
157157

158158
1. System ROS installation (`AMENT_PREFIX_PATH`, `CMAKE_PREFIX_PATH`)
159-
2. Common ROS paths (`/opt/ros/{rolling,jazzy,iron,humble}`)
159+
2. Common ROS paths (`/opt/ros/{rolling,jazzy,kilted,humble}`)
160160
3. Bundled assets (built-in message definitions in ros-z-codegen)
161161

162162
This fallback mechanism enables builds without ROS 2 installed.

book/src/chapters/distro_compatibility.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,12 @@ cargo nextest run --no-default-features --features humble
8787

8888
### Using Other Distributions
8989

90-
For Rolling, Iron, or Kilted, simply specify the distro feature:
90+
For Rolling or Kilted, simply specify the distro feature:
9191

9292
```bash
9393
# Build for Rolling
9494
cargo build --features rolling
9595

96-
# Build for Iron
97-
cargo build --features iron
98-
9996
# Build for Kilted
10097
cargo build --features kilted
10198
```

book/src/chapters/feature_flags.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,12 @@ cargo build --no-default-features --features humble
7878

7979
**Important:** Humble requires `--no-default-features` to avoid conflicts with the jazzy default.
8080

81-
### `rolling` and `iron`
81+
### `rolling`
8282

83-
Target newer distributions:
83+
Target Rolling distribution:
8484

8585
```bash
86-
# Rolling
8786
cargo build --features rolling
88-
89-
# Iron
90-
cargo build --features iron
9187
```
9288

9389
**See also:** [ROS 2 Distribution Compatibility](./distro_compatibility.md) for detailed documentation.

book/src/chapters/message_generation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ flowchart LR
189189
```
190190

191191
1. **System ROS:** `$AMENT_PREFIX_PATH`, `$CMAKE_PREFIX_PATH`
192-
2. **Standard paths:** `/opt/ros/{rolling,jazzy,iron,humble}`
192+
2. **Standard paths:** `/opt/ros/{rolling,jazzy,kilted,humble}`
193193
3. **Bundled assets:** Built-in message definitions in ros-z-codegen
194194

195195
This fallback enables development without ROS 2 installation.

crates/ros-z-msgs/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ protobuf = ["prost", "ros-z/protobuf", "ros-z-codegen/protobuf"]
7373
humble = ["ros-z/humble"]
7474
jazzy = ["ros-z/jazzy"]
7575
rolling = ["ros-z/rolling"]
76-
iron = ["ros-z/iron"]
7776
kilted = ["ros-z/kilted"]
7877
python_registry = [
7978
"pyo3",

crates/ros-z-msgs/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ fn discover_system_packages(packages: &[&str]) -> Result<Vec<PathBuf>> {
316316
let common_install_paths = vec![
317317
"/opt/ros/rolling",
318318
"/opt/ros/jazzy",
319-
"/opt/ros/iron",
319+
"/opt/ros/kilted",
320320
"/opt/ros/humble",
321321
];
322322

crates/ros-z-tests/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,4 @@ ros2dds-interop = ["ros-msgs", "ros-z/ros2dds", "ros-z/rmw-zenoh"]
4141
humble = ["ros-z/humble", "ros-z-msgs/humble"]
4242
jazzy = ["ros-z/jazzy", "ros-z-msgs/jazzy"]
4343
rolling = ["ros-z/rolling", "ros-z-msgs/rolling"]
44-
iron = ["ros-z/iron", "ros-z-msgs/iron"]
4544
kilted = ["ros-z/kilted", "ros-z-msgs/kilted"]

crates/ros-z/Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ ros2dds = ["ros-z-protocol/ros2dds"]
7474
# Default is jazzy (recommended for new projects)
7575
# For humble, use: --no-default-features --features humble,...
7676
# Note: Distro features are mutually exclusive - enabling multiple may cause conflicts
77-
humble = ["no-type-hash", "no-jazzy", "no-rolling", "no-iron", "no-kilted"]
78-
jazzy = ["type-hash", "no-humble", "no-rolling", "no-iron", "no-kilted"]
79-
rolling = ["type-hash", "no-humble", "no-jazzy", "no-iron", "no-kilted"]
80-
iron = ["type-hash", "no-humble", "no-jazzy", "no-rolling", "no-kilted"]
81-
kilted = ["type-hash", "no-humble", "no-jazzy", "no-rolling", "no-iron"]
77+
humble = ["no-type-hash", "no-jazzy", "no-rolling", "no-kilted"]
78+
jazzy = ["type-hash", "no-humble", "no-rolling", "no-kilted"]
79+
rolling = ["type-hash", "no-humble", "no-jazzy", "no-kilted"]
80+
kilted = ["type-hash", "no-humble", "no-jazzy", "no-rolling"]
8281

8382
# Internal features for distro compatibility
8483
humble-compat = []
@@ -89,7 +88,6 @@ no-type-hash = ["ros-z-protocol/no-type-hash"]
8988
no-humble = []
9089
no-jazzy = []
9190
no-rolling = []
92-
no-iron = []
9391
no-kilted = []
9492

9593

crates/ros-z/examples/protobuf_demo/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ prost-build = { workspace = true }
3232
humble = ["ros-z/humble", "ros-z-msgs/humble"]
3333
jazzy = ["ros-z/jazzy", "ros-z-msgs/jazzy"]
3434
rolling = ["ros-z/rolling", "ros-z-msgs/rolling"]
35-
iron = ["ros-z/iron", "ros-z-msgs/iron"]

0 commit comments

Comments
 (0)