From 0a8caf8294b6544a566ffc09694d032d4330dfe1 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 28 Mar 2022 09:34:47 +0200 Subject: [PATCH 1/2] Fix Zephyr CI (#480) Signed-off-by: Pablo Garrido (cherry picked from commit 0942f7412de47e8a590d486e4a408cdf4c3b3cb1) # Conflicts: # config/zephyr/generic/create.sh --- config/zephyr/generic/create.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh index 3dcc201b..2b762b3b 100755 --- a/config/zephyr/generic/create.sh +++ b/config/zephyr/generic/create.sh @@ -56,5 +56,11 @@ 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 +<<<<<<< HEAD rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP" +======= + # Workaround. Remove when https://github.com/sphinx-doc/sphinx/issues/10291 and https://github.com/micro-ROS/micro_ros_zephyr_module/runs/5714546662?check_suite_focus=true + pip3 install --upgrade Sphinx + +>>>>>>> 0942f74 (Fix Zephyr CI (#480)) popd >/dev/null From b7d3185f8136c7872dc07263835b0d9b63a5a91a Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 28 Mar 2022 09:37:21 +0200 Subject: [PATCH 2/2] Update Signed-off-by: Pablo Garrido --- config/zephyr/generic/create.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config/zephyr/generic/create.sh b/config/zephyr/generic/create.sh index 2b762b3b..eb298da1 100755 --- a/config/zephyr/generic/create.sh +++ b/config/zephyr/generic/create.sh @@ -56,11 +56,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 -<<<<<<< HEAD rosdep install -y --from-paths mcu_ws -i mcu_ws --rosdistro $ROS_DISTRO --skip-keys="$SKIP" -======= + # Workaround. Remove when https://github.com/sphinx-doc/sphinx/issues/10291 and https://github.com/micro-ROS/micro_ros_zephyr_module/runs/5714546662?check_suite_focus=true pip3 install --upgrade Sphinx ->>>>>>> 0942f74 (Fix Zephyr CI (#480)) popd >/dev/null