Skip to content

Commit ab4cb3c

Browse files
authored
Remove Iron support (#443)
Signed-off-by: Javier Balloffet <[email protected]>
1 parent e15100c commit ab4cb3c

File tree

6 files changed

+4
-51
lines changed

6 files changed

+4
-51
lines changed

.github/workflows/rust-minimal.yml

-5
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,12 @@ jobs:
2020
matrix:
2121
ros_distribution:
2222
- humble
23-
- iron
2423
- rolling
2524
include:
2625
# Humble Hawksbill (May 2022 - May 2027)
2726
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
2827
ros_distribution: humble
2928
ros_version: 2
30-
# Iron Irwini (May 2023 - November 2024)
31-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest
32-
ros_distribution: iron
33-
ros_version: 2
3429
# Rolling Ridley (June 2020 - Present)
3530
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
3631
ros_distribution: rolling

.github/workflows/rust-stable.yml

-5
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,12 @@ jobs:
2020
matrix:
2121
ros_distribution:
2222
- humble
23-
- iron
2423
- rolling
2524
include:
2625
# Humble Hawksbill (May 2022 - May 2027)
2726
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
2827
ros_distribution: humble
2928
ros_version: 2
30-
# Iron Irwini (May 2023 - November 2024)
31-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest
32-
ros_distribution: iron
33-
ros_version: 2
3429
# Rolling Ridley (June 2020 - Present)
3530
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
3631
ros_distribution: rolling

docs/building.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Build the Docker image with
5353

5454
```shell
5555
# Make sure to run this in the workspace directory
56-
# ROS_DISTRO can be humble|iron|rolling
56+
# ROS_DISTRO can be humble|rolling
5757
docker build -f src/ros2_rust/Dockerfile --build-arg "ROS_DISTRO=humble" -t ros2_rust_dev .
5858
```
5959

rclrs/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn main() {
3535
}
3636
};
3737

38-
println!("cargo:rustc-check-cfg=cfg(ros_distro, values(\"humble\", \"iron\", \"jazzy\", \"rolling\"))");
38+
println!("cargo:rustc-check-cfg=cfg(ros_distro, values(\"humble\", \"jazzy\", \"rolling\"))");
3939
println!("cargo:rustc-cfg=ros_distro=\"{ros_distro}\"");
4040

4141
let mut builder = bindgen::Builder::default()

rclrs/src/node/graph.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,8 @@ mod tests {
489489
let node = Node::new(&context, node_name).unwrap();
490490

491491
let check_rosout = |topics: HashMap<String, Vec<String>>| {
492-
// rosout shows up in humble and iron, even if the graph is empty
493-
#[cfg(any(ros_distro = "humble", ros_distro = "iron"))]
492+
// rosout shows up in humble, even if the graph is empty
493+
#[cfg(ros_distro = "humble")]
494494
{
495495
assert_eq!(topics.len(), 1);
496496
assert_eq!(

ros2_rust_iron.repos

-37
This file was deleted.

0 commit comments

Comments
 (0)