Skip to content

Commit bd3fbac

Browse files
pablogs9pablogs9
authored
Bump ubuntu on rolling (#702)
* Bump ubuntu * Update * Sync with Jazzy * Remove unnecesary
1 parent cbe5088 commit bd3fbac

26 files changed

Lines changed: 65 additions & 244 deletions

‎.github/workflows/ci.yml‎

Lines changed: 47 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
micro_ros_build:
1616
runs-on: ubuntu-latest
1717
container:
18-
image: ubuntu:jammy
18+
image: ubuntu:24.04
1919
strategy:
2020
fail-fast: false
2121
steps:
@@ -32,8 +32,6 @@ jobs:
3232
- name: Dependencies
3333
run: |
3434
apt update
35-
apt install -y python3-pip
36-
pip3 install colcon-common-extensions
3735
rosdep update --rosdistro ${{ env.ROS_DISTRO }}
3836
rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
3937
@@ -51,60 +49,57 @@ jobs:
5149
name: micro_ros_build_${{ inputs.ci_target_ref }}
5250
path: install
5351

54-
# Skiped due to libfastcdr version 1 distributed en ROS 2 Rolling
55-
# micro_ros_agent:
56-
# runs-on: ubuntu-latest
57-
# container:
58-
# image: ubuntu:jammy
59-
# strategy:
60-
# fail-fast: false
61-
# needs: micro_ros_build
62-
63-
# steps:
64-
# - uses: actions/checkout@v4
65-
# with:
66-
# path: src/micro_ros_setup
67-
# ref: ${{ inputs.ci_target_ref }}
68-
69-
# - uses: ros-tooling/setup-ros@0.7.7
70-
# with:
71-
# use-ros2-testing: false
72-
# required-ros-distributions: ${{ env.ROS_DISTRO }}
73-
74-
# - name: dependencies
75-
# run: |
76-
# apt update
77-
# apt install -y python3-pip
78-
# pip3 install colcon-common-extensions
79-
# apt install -y ros-${{ env.ROS_DISTRO }}-rmw-fastrtps-cpp
80-
# rosdep update --rosdistro ${{ env.ROS_DISTRO }}
81-
# rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
82-
83-
# - uses: actions/download-artifact@v1
84-
# with:
85-
# name: micro_ros_build_${{ inputs.ci_target_ref }}
86-
# path: install
87-
88-
# # Workaround https://github.com/actions/upload-artifact/issues/38
89-
# - run: |
90-
# chmod +x -R install
91-
92-
# - name: build
93-
# run: |
94-
# . /opt/ros/${{ env.ROS_DISTRO }}/setup.sh
95-
# . install/local_setup.sh
96-
# ros2 run micro_ros_setup create_agent_ws.sh
97-
# ros2 run micro_ros_setup build_agent.sh
98-
99-
# - name: installation
100-
# run: |
101-
# (test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false
52+
micro_ros_agent:
53+
runs-on: ubuntu-latest
54+
container:
55+
image: ubuntu:24.04
56+
strategy:
57+
fail-fast: false
58+
needs: micro_ros_build
59+
60+
steps:
61+
- uses: actions/checkout@v4
62+
with:
63+
path: src/micro_ros_setup
64+
ref: ${{ inputs.ci_target_ref }}
65+
66+
- uses: ros-tooling/setup-ros@0.7.7
67+
with:
68+
use-ros2-testing: false
69+
required-ros-distributions: ${{ env.ROS_DISTRO }}
70+
71+
- name: dependencies
72+
run: |
73+
apt update
74+
apt install -y ros-${{ env.ROS_DISTRO }}-rmw-fastrtps-cpp
75+
rosdep update --rosdistro ${{ env.ROS_DISTRO }}
76+
rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
77+
78+
- uses: actions/download-artifact@v1
79+
with:
80+
name: micro_ros_build_${{ inputs.ci_target_ref }}
81+
path: install
82+
83+
# Workaround https://github.com/actions/upload-artifact/issues/38
84+
- run: |
85+
chmod +x -R install
86+
87+
- name: build
88+
run: |
89+
. /opt/ros/${{ env.ROS_DISTRO }}/setup.sh
90+
. install/local_setup.sh
91+
ros2 run micro_ros_setup create_agent_ws.sh
92+
ros2 run micro_ros_setup build_agent.sh
93+
94+
- name: installation
95+
run: |
96+
(test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false
10297
10398
micro_ros_client:
10499
runs-on: ubuntu-latest
105100
needs: micro_ros_build
106101
container:
107-
image: ubuntu:jammy
102+
image: ubuntu:24.04
108103
strategy:
109104
fail-fast: false
110105
matrix:
@@ -204,10 +199,6 @@ jobs:
204199
configuration: weather_publisher
205200
binary: 'firmware/bin/weather_publisher'
206201

207-
- rtos: mbed
208-
platform: disco_l475vg_iot01a
209-
binary: 'firmware/micro_ros_mbed/cmake_build/DISCO_L475VG_IOT01A/develop/GCC_ARM/micro_ros_mbed.bin'
210-
211202
steps:
212203
- uses: actions/checkout@v4
213204
with:
@@ -223,9 +214,6 @@ jobs:
223214
run: |
224215
apt update
225216
apt upgrade -y
226-
apt-get update
227-
apt install -y python3-pip
228-
pip3 install colcon-common-extensions cmake
229217
rosdep update --rosdistro ${{ env.ROS_DISTRO }}
230218
rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
231219

‎README.md‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ This package provides tools and utils to crosscompile micro-ROS with just the co
3030

3131
| RTOS | Platform | Version | Example | Recommended Alternative |
3232
| ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- | ---------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
33-
| [Azure RTOS](https://azure.microsoft.com/es-es/services/rtos/) / [FreeRTOS](https://www.freertos.org/) / Bare metal | [Renesas RA6M5](https://www.renesas.com/us/en/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ra6m5-200mhz-arm-cortex-m33-trustzone-highest-integration-ethernet-and-can-fde) | Renesas e<sup>2</sup> studio | `renesas_ra ra6m5` | **[micro-ROS component for Renesas e<sup>2</sup> studio and RA6M5](https://github.com/micro-ROS/micro_ros_renesas2estudio_component)** |
3433
| [FreeRTOS](https://www.freertos.org/) | [ST Nucleo F446RE](https://www.st.com/en/evaluation-tools/nucleo-f446re.html) <sup>1</sup> | STM32CubeMX latest | `freertos nucleo_f446re` | **[micro-ROS utils for STM32CubeMX and STM32CubeIDE](https://github.com/micro-ROS/micro_ros_stm32cubemx_utils)** |
3534
| [FreeRTOS](https://www.freertos.org/) | [ST Nucleo F446ZE](https://www.st.com/en/evaluation-tools/nucleo-f446ze.html) <sup>1</sup> | STM32CubeMX latest | `freertos nucleo_f446ze` | **[micro-ROS utils for STM32CubeMX and STM32CubeIDE](https://github.com/micro-ROS/micro_ros_stm32cubemx_utils)** |
3635
| [FreeRTOS](https://www.freertos.org/) | [ST Nucleo F746ZG](https://www.st.com/en/evaluation-tools/nucleo-f746zg.html) <sup>1</sup> | STM32CubeMX latest | `freertos nucleo_f746zg` | **[micro-ROS utils for STM32CubeMX and STM32CubeIDE](https://github.com/micro-ROS/micro_ros_stm32cubemx_utils)** |
@@ -42,7 +41,6 @@ This package provides tools and utils to crosscompile micro-ROS with just the co
4241
| [Zephyr](https://www.zephyrproject.org/) | [ST B-L475E-IOT01A](https://docs.zephyrproject.org/latest/boards/arm/disco_l475_iot1/doc/index.html) | v2.6.0 | `zephyr discovery_l475_iot1` | **[micro-ROS module for Zephyr RTOS](https://github.com/micro-ROS/micro_ros_zephyr_module)** |
4342
| [Zephyr](https://www.zephyrproject.org/) | [ST Nucleo H743ZI](https://www.st.com/en/evaluation-tools/nucleo-h743zi.html) <sup>1</sup> | v2.6.0 | `zephyr nucleo_h743zi` | **[micro-ROS module for Zephyr RTOS](https://github.com/micro-ROS/micro_ros_zephyr_module)** |
4443
| [Zephyr](https://www.zephyrproject.org/) | [Zephyr emulator](https://docs.zephyrproject.org/2.3.0/boards/posix/native_posix/doc/index.html) | v2.6.0 | `zephyr host` | **[micro-ROS module for Zephyr RTOS](https://github.com/micro-ROS/micro_ros_zephyr_module)** |
45-
| [Mbed](https://os.mbed.com/) | [ST B-L475E-IOT01A](https://os.mbed.com/platforms/ST-Discovery-L475E-IOT01A/) | v6.6 | `mbed disco_l475vg_iot01a` | **[micro-ROS module for Mbed RTOS](https://github.com/micro-ROS/micro_ros_mbed)** |
4644
| - | Static library (.a) and headers (.h) <sup>3</sup> | - | `generate_lib` | |
4745
| Linux | *Host <sup>2</sup>* | Ubuntu 18.04/20.04 | `host` | |
4846
| Android | [AOSP](https://source.android.com) <sup>1</sup> | Latest | `android generic` | |
@@ -162,17 +160,17 @@ Please note that each RTOS has its configuration approach that you might use for
162160

163161
In summary, the supported configurations for transports are:
164162

165-
| | FreeRTOS | Zephyr | Mbed |
166-
| ----------------------------- | :---------------: | :----------------: | :---: |
167-
| Olimex STM32-E407 | UART, Network | USB, UART | - |
168-
| ST B-L475E-IOT01A | - | USB, UART, Network | UART |
169-
| Crazyflie 2.1 | Custom Radio Link | - | - |
170-
| Espressif ESP32 | UART, WiFI UDP | - | - |
171-
| ST Nucleo F446RE <sup>1</sup> | UART | UART | - |
172-
| ST Nucleo F446ZE <sup>1</sup> | UART | - | - |
173-
| ST Nucleo H743ZI <sup>1</sup> | - | UART | - |
174-
| ST Nucleo F746ZG <sup>1</sup> | UART | UART | - |
175-
| ST Nucleo F767ZI <sup>1</sup> | UART | - | - |
163+
| | FreeRTOS | Zephyr |
164+
| ----------------------------- | :---------------: | :----------------: |
165+
| Olimex STM32-E407 | UART, Network | USB, UART |
166+
| ST B-L475E-IOT01A | - | USB, UART, Network |
167+
| Crazyflie 2.1 | Custom Radio Link | - |
168+
| Espressif ESP32 | UART, WiFI UDP | - |
169+
| ST Nucleo F446RE <sup>1</sup> | UART | UART |
170+
| ST Nucleo F446ZE <sup>1</sup> | UART | - |
171+
| ST Nucleo H743ZI <sup>1</sup> | - | UART |
172+
| ST Nucleo F746ZG <sup>1</sup> | UART | UART |
173+
| ST Nucleo F767ZI <sup>1</sup> | UART | - |
176174

177175
*<sup>1</sup> Community supported, may have lack of official support*
178176

‎config/freertos/esp32/create.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ pushd $FW_TARGETDIR >/dev/null
1919
echo "Error: python3-pip package must be installed before continuing..."
2020
exit 1
2121
fi
22-
pip3 install virtualenv
22+
pip3 install virtualenv --break-system-packages
2323
python3 esp-idf/tools/idf_tools.py install-python-env
2424

2525
eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
2626

2727
. $IDF_PATH/export.sh
2828

29-
pip3 install catkin_pkg lark-parser colcon-common-extensions
29+
pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages
3030

3131
popd >/dev/null
3232

‎config/mbed/dev_ros2_packages.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎config/mbed/dev_uros_packages.repos‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎config/mbed/generic/board.repos‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎config/mbed/generic/build.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎config/mbed/generic/client_uros_packages.repos‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎config/mbed/generic/create.sh‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎config/mbed/generic/flash.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)