Remove Iron support

ros2-rust · Dec 6, 2024 · 2e8d9d6 · 2e8d9d6
1 parent f706824
commit 2e8d9d6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 43 deletions.
diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml
@@ -20,17 +20,12 @@ jobs:
       matrix:
         ros_distribution:
           - humble
-          - iron
           - rolling
         include:
           # Humble Hawksbill (May 2022 - May 2027)
           - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
             ros_distribution: humble
             ros_version: 2
-          # Iron Irwini (May 2023 - November 2024)
-          - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest
-            ros_distribution: iron
-            ros_version: 2
           # Rolling Ridley  (June 2020 - Present)
           - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
             ros_distribution: rolling

diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml
@@ -20,17 +20,12 @@ jobs:
       matrix:
         ros_distribution:
           - humble
-          - iron
           - rolling
         include:
           # Humble Hawksbill (May 2022 - May 2027)
           - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
             ros_distribution: humble
             ros_version: 2
-          # Iron Irwini (May 2023 - November 2024)
-          - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest
-            ros_distribution: iron
-            ros_version: 2
           # Rolling Ridley  (June 2020 - Present)
           - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
             ros_distribution: rolling

diff --git a/docs/building.md b/docs/building.md
@@ -53,7 +53,7 @@ Build the Docker image with
 
 ```shell
 # Make sure to run this in the workspace directory
-# ROS_DISTRO can be humble|iron|rolling
+# ROS_DISTRO can be humble|rolling
 docker build -f src/ros2_rust/Dockerfile --build-arg "ROS_DISTRO=humble" -t ros2_rust_dev
 ```
 

diff --git a/rclrs/build.rs b/rclrs/build.rs
@@ -35,7 +35,7 @@ fn main() {
         }
     };
 
-    println!("cargo:rustc-check-cfg=cfg(ros_distro, values(\"humble\", \"iron\", \"jazzy\", \"rolling\"))");
+    println!("cargo:rustc-check-cfg=cfg(ros_distro, values(\"humble\", \"jazzy\", \"rolling\"))");
     println!("cargo:rustc-cfg=ros_distro=\"{ros_distro}\"");
 
     let mut builder = bindgen::Builder::default()

diff --git a/rclrs/src/node/graph.rs b/rclrs/src/node/graph.rs
@@ -489,8 +489,8 @@ mod tests {
         let node = Node::new(&context, node_name).unwrap();
 
         let check_rosout = |topics: HashMap<String, Vec<String>>| {
-            // rosout shows up in humble and iron, even if the graph is empty
-            #[cfg(any(ros_distro = "humble", ros_distro = "iron"))]
+            // rosout shows up in humble, even if the graph is empty
+            #[cfg(ros_distro = "humble")]
             {
                 assert_eq!(topics.len(), 1);
                 assert_eq!(

diff --git a/ros2_rust_iron.repos b/ros2_rust_iron.repos