Skip to content

Commit c5b57e9

Browse files
Fix CI issues (backport #826) (#832)
(cherry picked from commit 461010c) Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> Co-authored-by: David-LP99 <davidlaseca@eprosima.com>
1 parent 619ccc1 commit c5b57e9

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

‎config/freertos/esp32/create.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ pushd $FW_TARGETDIR >/dev/null
3232

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

35+
# ESP-IDF v4.1 tooling imports pkg_resources, which setuptools dropped in release 81.
36+
# Its requirements.txt only pins setuptools>=21, so pin it back here.
37+
python3 -m pip install "setuptools<81" pyyaml
38+
3539
. $IDF_PATH/export.sh
3640

3741
pip3 install catkin_pkg lark-parser colcon-common-extensions

‎config/raspbian/generic/configure.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
pushd $FW_TARGETDIR >/dev/null
44
rm -rf mcu_ws/*
55
cp raspbian_apps/toolchain.cmake mcu_ws/
6-
curl -s https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos |\
6+
# ROS_DISTRO SPECIFIC
7+
curl -s https://raw.githubusercontent.com/ros2/ros2/kilted/ros2.repos |\
78
ros2 run micro_ros_setup yaml_filter.py raspbian_apps/$CONFIG_NAME/ros2_repos.filter > ros2.repos
89
vcs import --input ros2.repos mcu_ws/ && rm ros2.repos
910

0 commit comments

Comments
 (0)