From da2cbe4e8c950ecd26e61a62e21a7cd284b0ed9d Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 3 Jun 2024 09:56:52 +0200 Subject: [PATCH] Bump jazzy --- .github/workflows/nightly.yml | 4 ++- README.md | 4 +-- modules/libmicroros/libmicroros.mk | 52 +++++++++++++++--------------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 859b77d..6bab7f5 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: zephyr_version: ["zephyr-v3.1.0", "zephyr-v2.7.2"] - distro: ["iron", "humble", "rolling"] + distro: ["iron", "humble", "rolling", "jazzy"] include: - distro: iron branch: iron @@ -25,6 +25,8 @@ jobs: branch: rolling - distro: humble branch: humble + - distro: jazzy + branch: jazzy - zephyr_version: zephyr-v2.7.2 zephyr_sdk: 0.14.2 sdk_filename: zephyr-sdk-$TOOLCHAIN_VERSION\_linux-x86_64_minimal.tar.gz diff --git a/README.md b/README.md index 1e9bd43..af8a08e 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,10 @@ Is possible to use a micro-ROS Agent just with this docker command: ```bash # Serial micro-ROS Agent -docker run -it --rm -v /dev:/dev --privileged --net=host microros/micro-ros-agent:rolling serial --dev [YOUR BOARD PORT] -v6 +docker run -it --rm -v /dev:/dev --privileged --net=host microros/micro-ros-agent:jazzy serial --dev [YOUR BOARD PORT] -v6 # UDPv4 micro-ROS Agent -docker run -it --rm --net=host microros/micro-ros-agent:rolling udp4 --port 8888 -v6 +docker run -it --rm --net=host microros/micro-ros-agent:jazzy udp4 --port 8888 -v6 ``` diff --git a/modules/libmicroros/libmicroros.mk b/modules/libmicroros/libmicroros.mk index f90f551..09467d3 100644 --- a/modules/libmicroros/libmicroros.mk +++ b/modules/libmicroros/libmicroros.mk @@ -61,12 +61,12 @@ configure_toolchain: $(COMPONENT_PATH)/zephyr_toolchain.cmake.in $(COMPONENT_PATH)/micro_ros_dev/install: rm -rf micro_ros_dev; \ mkdir micro_ros_dev; cd micro_ros_dev; \ - git clone -b rolling https://github.com/ament/ament_cmake src/ament_cmake; \ - git clone -b rolling https://github.com/ament/ament_lint src/ament_lint; \ - git clone -b rolling https://github.com/ament/ament_package src/ament_package; \ - git clone -b rolling https://github.com/ament/googletest src/googletest; \ - git clone -b rolling https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \ - git clone -b rolling https://github.com/ament/ament_index src/ament_index; \ + git clone -b jazzy https://github.com/ament/ament_cmake src/ament_cmake; \ + git clone -b jazzy https://github.com/ament/ament_lint src/ament_lint; \ + git clone -b jazzy https://github.com/ament/ament_package src/ament_package; \ + git clone -b jazzy https://github.com/ament/googletest src/googletest; \ + git clone -b jazzy https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \ + git clone -b jazzy https://github.com/ament/ament_index src/ament_index; \ colcon build --cmake-args -DBUILD_TESTING=OFF; $(COMPONENT_PATH)/micro_ros_src/src: @@ -74,26 +74,26 @@ $(COMPONENT_PATH)/micro_ros_src/src: mkdir micro_ros_src; cd micro_ros_src; \ git clone -b ros2 https://github.com/eProsima/micro-CDR src/micro-CDR; \ git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client; \ - git clone -b rolling https://github.com/micro-ROS/rcl src/rcl; \ - git clone -b rolling https://github.com/ros2/rclc src/rclc; \ - git clone -b rolling https://github.com/micro-ROS/rcutils src/rcutils; \ - git clone -b rolling https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \ - git clone -b rolling https://github.com/micro-ROS/rmw-microxrcedds src/rmw-microxrcedds; \ - git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \ - git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \ - git clone -b rolling https://github.com/ros2/rosidl src/rosidl; \ - git clone -b rolling https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \ - git clone -b rolling https://github.com/ros2/rmw src/rmw; \ - git clone -b rolling https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \ - git clone -b rolling https://github.com/ros2/rosidl_defaults src/rosidl_defaults; \ - git clone -b rolling https://github.com/ros2/unique_identifier_msgs src/unique_identifier_msgs; \ - git clone -b rolling https://github.com/ros2/common_interfaces src/common_interfaces; \ - git clone -b rolling https://github.com/ros2/test_interface_files src/test_interface_files; \ - git clone -b rolling https://github.com/ros2/rmw_implementation src/rmw_implementation; \ - git clone -b rolling https://github.com/ros2/rcl_logging src/rcl_logging; \ - git clone -b rolling https://github.com/ros2/ros2_tracing src/ros2_tracing; \ - git clone -b rolling https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \ - git clone -b rolling https://github.com/ros2/rosidl_core src/rosidl_core; \ + git clone -b jazzy https://github.com/micro-ROS/rcl src/rcl; \ + git clone -b jazzy https://github.com/ros2/rclc src/rclc; \ + git clone -b jazzy https://github.com/micro-ROS/rcutils src/rcutils; \ + git clone -b jazzy https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \ + git clone -b jazzy https://github.com/micro-ROS/rmw-microxrcedds src/rmw-microxrcedds; \ + git clone -b jazzy https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \ + git clone -b jazzy https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \ + git clone -b jazzy https://github.com/ros2/rosidl src/rosidl; \ + git clone -b jazzy https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \ + git clone -b jazzy https://github.com/ros2/rmw src/rmw; \ + git clone -b jazzy https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \ + git clone -b jazzy https://github.com/ros2/rosidl_defaults src/rosidl_defaults; \ + git clone -b jazzy https://github.com/ros2/unique_identifier_msgs src/unique_identifier_msgs; \ + git clone -b jazzy https://github.com/ros2/common_interfaces src/common_interfaces; \ + git clone -b jazzy https://github.com/ros2/test_interface_files src/test_interface_files; \ + git clone -b jazzy https://github.com/ros2/rmw_implementation src/rmw_implementation; \ + git clone -b jazzy https://github.com/ros2/rcl_logging src/rcl_logging; \ + git clone -b jazzy https://github.com/ros2/ros2_tracing src/ros2_tracing; \ + git clone -b jazzy https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \ + git clone -b jazzy https://github.com/ros2/rosidl_core src/rosidl_core; \ touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \ touch src/ros2_tracing/lttngpy/COLCON_IGNORE; \ touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \