From 8f65124ae553db5a3a7affea5125abf277144dc9 Mon Sep 17 00:00:00 2001 From: Javier Balloffet Date: Fri, 6 Dec 2024 12:53:44 +0100 Subject: [PATCH] Remove Iron support Signed-off-by: Javier Balloffet --- .github/workflows/rust-minimal.yml | 5 ----- .github/workflows/rust-stable.yml | 5 ----- docs/building.md | 2 +- rclrs/build.rs | 2 +- rclrs/src/node/graph.rs | 4 ++-- ros2_rust_iron.repos | 29 ----------------------------- 6 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 ros2_rust_iron.repos diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index 177e667e5..a93dfe318 100644 --- 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 index 4f6bf2300..fec89e84b 100644 --- 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 index 610187cee..376ce505d 100644 --- 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 index 91d0b190f..e35c505cb 100644 --- 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 index 639a38e38..b9f2e11d1 100644 --- 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>| { - // 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 deleted file mode 100644 index caa51bdfe..000000000 --- a/ros2_rust_iron.repos +++ /dev/null @@ -1,29 +0,0 @@ -repositories: - ros2/common_interfaces: - type: git - url: https://github.com/ros2/common_interfaces.git - version: iron - ros2/example_interfaces: - type: git - url: https://github.com/ros2/example_interfaces.git - version: iron - ros2/rcl_interfaces: - type: git - url: https://github.com/ros2/rcl_interfaces.git - version: iron - ros2/test_interface_files: - type: git - url: https://github.com/ros2/test_interface_files.git - version: iron - ros2/rosidl_core: - type: git - url: https://github.com/ros2/rosidl_core.git - version: iron - ros2/rosidl_defaults: - type: git - url: https://github.com/ros2/rosidl_defaults.git - version: iron - ros2/unique_identifier_msgs: - type: git - url: https://github.com/ros2/unique_identifier_msgs.git - version: iron