From 79bb64cac77a2a5b245fb3b2502944d88339f6fe Mon Sep 17 00:00:00 2001 From: Daniel Azanov Date: Wed, 8 Jan 2025 12:50:18 +0100 Subject: [PATCH 1/2] Add jazzy distro --- rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py | 2 +- scripts/_RosTeamWs_Defines.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py index 72672a16..05c6d300 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py @@ -359,7 +359,7 @@ def add_arguments(self, parser: argparse.ArgumentParser, cli_name: str): type=str, help="ROS distro to use for the workspace.", required=True, - choices=["humble", "rolling"], + choices=["humble", "jazzy", "rolling"], ) parser.add_argument( "--docker", action="store_true", help="Create a docker workspace.", default=False diff --git a/scripts/_RosTeamWs_Defines.bash b/scripts/_RosTeamWs_Defines.bash index fd171dc7..88f8c5b9 100755 --- a/scripts/_RosTeamWs_Defines.bash +++ b/scripts/_RosTeamWs_Defines.bash @@ -28,7 +28,7 @@ fi # All the possible supported ros distributions supported by rtw if [ -z "$rtw_supported_ros_distributions" ]; then - readonly rtw_supported_ros_distributions=("noetic" "foxy" "galactic" "humble" "iron" "rolling") + readonly rtw_supported_ros_distributions=("noetic" "foxy" "galactic" "humble" "iron" "jazzy" "rolling") fi # Mapping of ubuntu version and supported ros distributions From c2ef3fba8be1167864d92890c1e65674458e4ddf Mon Sep 17 00:00:00 2001 From: Daniel Azanov Date: Wed, 8 Jan 2025 13:13:02 +0100 Subject: [PATCH 2/2] set ros_version=2 for jazzy --- scripts/_RosTeamWs_Defines.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/_RosTeamWs_Defines.bash b/scripts/_RosTeamWs_Defines.bash index 88f8c5b9..eb1d2f28 100755 --- a/scripts/_RosTeamWs_Defines.bash +++ b/scripts/_RosTeamWs_Defines.bash @@ -534,6 +534,9 @@ function set_ros_version_for_distro { iron) ros_version=2 ;; + jazzy) + ros_version=2 + ;; rolling) ros_version=2 ;;