Initial changes for Rolling release (#255)

pablogs9 · pablogs9 · commit 0ce6377eedeb · 2021-05-21T08:51:42.000+02:00
* Initial renaming * Update RCL to master * Update branches * Update CI * Update host * Update nuttx * Fix yaml * Update host Update apps repos to main (#259) * Update freertos apps * Update raspbian apps * Update Zephyr apps * Remove tinydir * Update ROS2 tracing * Speedup host build Update readme Mbed initial support (#266) Update Revert "Fix RCLC to foxy branch (#296)" This reverts commit 8fd6b5e. Revert "Mbed initial support (#266)" This reverts commit 4e74a620ebe3e54778480f91d8429cad10fd3134. Mbed initial support (#266) Update Update Revert "Mbed initial support (#266)" This reverts commit 6fe1865.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
 
   micro_ros_build:
     runs-on: ubuntu-latest
-    container: ros:${{github.base_ref}}
+    container: ros:rolling
 
     steps:
       - uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
 
   micro_ros_agent:
     runs-on: ubuntu-latest
-    container: ros:${{github.base_ref}}
+    container: ros:rolling
     needs: micro_ros_build
 
     steps:
@@ -76,7 +76,7 @@ jobs:
 
   micro_ros_client:
     runs-on: ubuntu-latest
-    container: ros:${{github.base_ref}}
+    container: ros:rolling
     needs: micro_ros_build
 
     strategy:
@@ -207,7 +207,7 @@ jobs:
 
       - name: Configure and build micro-ROS
         run: |
-          . /opt/ros/foxy/setup.sh
+          . /opt/ros/rolling/setup.sh
           . install/local_setup.sh
           ros2 run micro_ros_setup create_firmware_ws.sh ${{ matrix.rtos }} ${{ matrix.platform }}
           ros2 run micro_ros_setup configure_firmware.sh ${{ matrix.configuration }} ${{ matrix.transport_arguments }} 
diff --git a/README.md b/README.md
@@ -61,6 +61,7 @@ This package targets the **ROS 2** installation. ROS 2 supported distributions a
 | Crystal      | Supported | `crystal` |
 | Dashing      | Supported | `dashing` |
 | Foxy         | Supported | `foxy`    |
+| Rolling      | Supported | `main`    |
 
 Some other prerequisites needed for building a firmware using this package are:
 
@@ -77,7 +78,7 @@ source /opt/ros/$ROS_DISTRO/setup.bash
 
 mkdir uros_ws && cd uros_ws
 
-git clone -b $ROS_DISTRO https://github.com/micro-ROS/micro_ros_setup.git src/micro_ros_setup
+git clone -b master https://github.com/micro-ROS/micro_ros_setup.git src/micro_ros_setup
 
 rosdep update && rosdep install --from-path src --ignore-src -y
 
diff --git a/config/agent_uros_packages.repos b/config/agent_uros_packages.repos
@@ -3,15 +3,15 @@ repositories:
   uros/rosidl_typesupport_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
-    version: foxy
+    version: main
   uros/rmw_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rmw-microxrcedds.git
-    version: foxy
+    version: main
   uros/micro_ros_msgs:
     type: git
     url: https://github.com/micro-ROS/micro_ros_msgs.git
-    version: foxy
+    version: main
   uros/micro-ROS-Agent:
     type: git
     url: https://github.com/micro-ROS/micro-ROS-Agent.git
diff --git a/config/client_uros_packages.repos b/config/client_uros_packages.repos
@@ -12,38 +12,32 @@ repositories:
   uros/rcl:
     type: git
     url: https://github.com/micro-ROS/rcl
-    version: foxy
+    version: master
   uros/rclc:
     type: git
     url: https://github.com/ros2/rclc
-    version: foxy
+    version: master
   uros/rcutils:
     type: git
     url: https://github.com/micro-ROS/rcutils
-    version: foxy
+    version: master
   uros/micro_ros_msgs:
     type: git
     url: https://github.com/micro-ROS/micro_ros_msgs.git
-    version: foxy
+    version: main
   uros/rmw_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rmw-microxrcedds.git
-    version: foxy
+    version: main
   uros/rosidl_typesupport:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport.git
-    version: foxy
+    version: master
   uros/rosidl_typesupport_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
-    version: foxy
+    version: main
   uros/tracetools:
     type: git
     url: https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing
-    version: foxy_microros
-
-# Remove this when it returns to ros2.repos
-  ros2/tinydir_vendor:
-    type: git
-    url: https://github.com/ros2/tinydir_vendor.git
     version: master
diff --git a/config/freertos/crazyflie21/board.repos b/config/freertos/crazyflie21/board.repos
@@ -7,5 +7,5 @@ repositories:
   freertos_apps:
     type: git
     url: https://github.com/micro-ROS/freertos_apps
-    version: foxy
+    version: main
 
diff --git a/config/freertos/crazyflie21/create.sh b/config/freertos/crazyflie21/create.sh
@@ -23,6 +23,6 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 
 popd >/dev/null
diff --git a/config/freertos/esp32/board.repos b/config/freertos/esp32/board.repos
@@ -2,7 +2,7 @@ repositories:
   freertos_apps:
     type: git
     url: https://github.com/micro-ROS/freertos_apps
-    version: foxy
+    version: main
 
 
 
diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh
@@ -43,5 +43,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/config/freertos/nucleo_f446re/board.repos b/config/freertos/nucleo_f446re/board.repos
@@ -1,5 +1,5 @@
 repositories:
   freertos_apps:
     type: git
-    url: https://github.com/micro-ROS/freertos_apps
-    version: foxy
+    url: https://github.com/micro-ros/freertos_apps
+    version: main
diff --git a/config/freertos/nucleo_f446re/create.sh b/config/freertos/nucleo_f446re/create.sh
@@ -22,5 +22,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/config/freertos/nucleo_f446ze/board.repos b/config/freertos/nucleo_f446ze/board.repos
@@ -1,5 +1,5 @@
 repositories:
   freertos_apps:
     type: git
-    url: https://github.com/micro-ROS/freertos_apps
-    version: foxy
+    url: https://github.com/micro-ros/freertos_apps
+    version: main
diff --git a/config/freertos/nucleo_f446ze/create.sh b/config/freertos/nucleo_f446ze/create.sh
@@ -22,5 +22,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/config/freertos/nucleo_f746zg/board.repos b/config/freertos/nucleo_f746zg/board.repos
@@ -1,5 +1,5 @@
 repositories:
   freertos_apps:
     type: git
-    url: https://github.com/micro-ROS/freertos_apps
-    version: foxy
+    url: https://github.com/micro-ros/freertos_apps
+    version: main
diff --git a/config/freertos/nucleo_f746zg/create.sh b/config/freertos/nucleo_f746zg/create.sh
@@ -22,5 +22,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/config/freertos/nucleo_f767zi/board.repos b/config/freertos/nucleo_f767zi/board.repos
@@ -1,5 +1,5 @@
 repositories:
   freertos_apps:
     type: git
-    url: https://github.com/micro-ROS/freertos_apps
-    version: foxy
+    url: https://github.com/micro-ros/freertos_apps
+    version: main
diff --git a/config/freertos/nucleo_f767zi/create.sh b/config/freertos/nucleo_f767zi/create.sh
@@ -22,5 +22,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/config/freertos/olimex-stm32-e407/board.repos b/config/freertos/olimex-stm32-e407/board.repos
@@ -2,7 +2,7 @@ repositories:
   freertos_apps:
     type: git
     url: https://github.com/micro-ROS/freertos_apps
-    version: foxy
+    version: main
 
 
 
diff --git a/config/freertos/olimex-stm32-e407/create.sh b/config/freertos/olimex-stm32-e407/create.sh
@@ -22,5 +22,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/config/generate_lib/generic/create.sh b/config/generate_lib/generic/create.sh
@@ -10,5 +10,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/config/host/generic/build.sh b/config/host/generic/build.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src $@
-colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src $@
+colcon build --packages-up-to rosidl_typesupport_microxrcedds_c --metas src --cmake-args -DBUILD_TESTING=OFF $@
+colcon build --packages-up-to rosidl_typesupport_microxrcedds_cpp --metas src --cmake-args -DBUILD_TESTING=OFF $@
 
 set +o nounset
 . /opt/ros/$ROS_DISTRO/setup.bash
 . install/local_setup.bash
 set -o nounset
 
-colcon build --metas src $@
+colcon build --metas src --cmake-args -DBUILD_TESTING=OFF $@
diff --git a/config/host/generic/client_host_packages.repos b/config/host/generic/client_host_packages.repos
@@ -17,19 +17,19 @@ repositories:
   uros/micro_ros_msgs:
     type: git
     url: https://github.com/micro-ROS/micro_ros_msgs.git
-    version: foxy
+    version: main
   uros/rmw_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rmw-microxrcedds.git
-    version: foxy
+    version: main
   uros/rosidl_typesupport_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
-    version: foxy
+    version: main
   uros/micro-ROS-demos:
     type: git
     url: https://github.com/micro-ROS/micro-ROS-demos.git
-    version: foxy
+    version: main
 
 # Required messages packages
 
diff --git a/config/nuttx/generic/client_uros_packages.repos b/config/nuttx/generic/client_uros_packages.repos
@@ -9,47 +9,40 @@ repositories:
     version: foxy
 
 # MicroROS
-  
   uros/rcl:
     type: git
-    url: https://github.com/micro-ROS/rcl.git
-    version: foxy
+    url: https://github.com/micro-ROS/rcl
+    version: master
   uros/rclc:
     type: git
     url: https://github.com/ros2/rclc.git
-    version: foxy
+    version: master
+  uros/rcutils:
+    type: git
+    url: https://github.com/micro-ROS/rcutils
+    version: master
   uros/micro_ros_msgs:
     type: git
     url: https://github.com/micro-ROS/micro_ros_msgs.git
-    version: foxy
+    version: main
   uros/rmw_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rmw-microxrcedds.git
-    version: foxy
-  uros/rcutils:
-    type: git
-    url: https://github.com/micro-ROS/rcutils.git
-    version: foxy
+    version: main
   drive_base:
     type: git
     url: https://github.com/micro-ROS/drive_base.git
     version: master
-  uros/tracetools:
-    type: git
-    url: https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing
-    version: foxy_microros
   uros/rosidl_typesupport:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport.git
-    version: foxy
+    version: master
   uros/rosidl_typesupport_microxrcedds:
     type: git
     url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
-    version: foxy
-
-# interim, until crosscompile fix is available in foxy branch
-  ros2/tinydir_vendor:
+    version: main
+  uros/tracetools:
     type: git
-    url: https://github.com/ros2/tinydir_vendor.git
+    url: https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing
     version: master
 
diff --git a/config/nuttx/generic/create.sh b/config/nuttx/generic/create.sh
@@ -30,9 +30,9 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 
 popd >/dev/null
 
 cp $PREFIX/config/$RTOS/generic/package.xml $FW_TARGETDIR/apps/package.xml
-rosdep install -y --from-paths $FW_TARGETDIR/apps -i $FW_TARGETDIR/apps --rosdistro foxy
+rosdep install -y --from-paths $FW_TARGETDIR/apps -i $FW_TARGETDIR/apps --rosdistro $ROS_DISTRO
diff --git a/config/raspbian/generic/create.sh b/config/raspbian/generic/create.sh
@@ -18,5 +18,5 @@ pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null
 popd >/dev/null
 
 pushd $FW_TARGETDIR >/dev/null
-    git clone -b foxy https://github.com/micro-ROS/raspbian_apps.git
+    git clone -b main https://github.com/micro-ROS/raspbian_apps.git
 popd >/dev/null
diff --git a/config/zephyr/generic/board.repos b/config/zephyr/generic/board.repos
@@ -2,4 +2,4 @@ repositories:
   zephyr_apps:
     type: git
     url: https://github.com/micro-ROS/zephyr_apps
-    version: foxy
+    version: main
diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh
@@ -53,5 +53,5 @@ pushd $FW_TARGETDIR >/dev/null
     touch mcu_ws/uros/rcl/rcl_yaml_param_parser/COLCON_IGNORE
     touch mcu_ws/uros/rclc/rclc_examples/COLCON_IGNORE
 
-    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro foxy --skip-keys="$SKIP"
+    rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP"
 popd >/dev/null
diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh
diff --git a/scripts/create_ws.sh b/scripts/create_ws.sh
