From b9175bc09e77ddf0507bae66a7744fc3d3971b0e Mon Sep 17 00:00:00 2001 From: David-LP99 Date: Tue, 11 Aug 2026 11:05:20 +0200 Subject: [PATCH 1/2] Fix CI (#826) Signed-off-by: David Laseca Perez (cherry picked from commit 461010cfa0ba1eb25c01d58823f8bd83cd61f161) # Conflicts: # config/raspbian/generic/configure.sh --- config/freertos/esp32/create.sh | 4 ++++ config/raspbian/generic/configure.sh | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index dff641da..58afeeb9 100755 --- a/config/freertos/esp32/create.sh +++ b/config/freertos/esp32/create.sh @@ -24,6 +24,10 @@ pushd $FW_TARGETDIR >/dev/null eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system) + # ESP-IDF v4.1 tooling imports pkg_resources, which setuptools dropped in release 81. + # Its requirements.txt only pins setuptools>=21, so pin it back here. + python3 -m pip install "setuptools<81" pyyaml + . $IDF_PATH/export.sh pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions diff --git a/config/raspbian/generic/configure.sh b/config/raspbian/generic/configure.sh index a8d73c8a..d96c9a6f 100755 --- a/config/raspbian/generic/configure.sh +++ b/config/raspbian/generic/configure.sh @@ -3,7 +3,12 @@ pushd $FW_TARGETDIR >/dev/null rm -rf mcu_ws/* cp raspbian_apps/toolchain.cmake mcu_ws/ +<<<<<<< HEAD curl -s https://raw.githubusercontent.com/ros2/ros2/humble/ros2.repos |\ +======= + # ROS_DISTRO SPECIFIC + curl -s https://raw.githubusercontent.com/ros2/ros2/kilted/ros2.repos |\ +>>>>>>> 461010c (Fix CI (#826)) ros2 run micro_ros_setup yaml_filter.py raspbian_apps/$CONFIG_NAME/ros2_repos.filter > ros2.repos vcs import --input ros2.repos mcu_ws/ && rm ros2.repos From 320412fdc9297f6935d9c442429c3fb0d1befc6e Mon Sep 17 00:00:00 2001 From: David Laseca Perez Date: Tue, 15 Sep 2026 10:58:50 +0200 Subject: [PATCH 2/2] Adapt fix for humble Signed-off-by: David Laseca Perez --- config/raspbian/generic/configure.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/config/raspbian/generic/configure.sh b/config/raspbian/generic/configure.sh index d96c9a6f..e6abcd91 100755 --- a/config/raspbian/generic/configure.sh +++ b/config/raspbian/generic/configure.sh @@ -3,12 +3,8 @@ pushd $FW_TARGETDIR >/dev/null rm -rf mcu_ws/* cp raspbian_apps/toolchain.cmake mcu_ws/ -<<<<<<< HEAD - curl -s https://raw.githubusercontent.com/ros2/ros2/humble/ros2.repos |\ -======= # ROS_DISTRO SPECIFIC - curl -s https://raw.githubusercontent.com/ros2/ros2/kilted/ros2.repos |\ ->>>>>>> 461010c (Fix CI (#826)) + curl -s https://raw.githubusercontent.com/ros2/ros2/humble/ros2.repos |\ ros2 run micro_ros_setup yaml_filter.py raspbian_apps/$CONFIG_NAME/ros2_repos.filter > ros2.repos vcs import --input ros2.repos mcu_ws/ && rm ros2.repos