From 0a9508e96660bfdad3a957b6e063beca18cb7c01 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 1 Dec 2023 10:01:11 +0100 Subject: [PATCH] Fix empy dep (#678) * Fix empy dep * Fix * Install colcon * Fix (cherry picked from commit fa7c6127c1eb600febd1be9c977c22e73d3bb8bd) # Conflicts: # .github/workflows/ci.yml # .github/workflows/nightly.yml --- .github/workflows/ci.yml | 21 ++++++++++++++++++--- .github/workflows/nightly.yml | 23 +++++++++++++++++++++-- config/freertos/esp32/create.sh | 2 +- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdf2a9b3..3c47152e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,11 @@ jobs: with: path: src/micro_ros_setup +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.6.1 +======= + - uses: ros-tooling/setup-ros@0.7.0 +>>>>>>> fa7c612 (Fix empy dep (#678)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -30,7 +34,8 @@ jobs: - name: Dependencies run: | apt update - apt install -y python3-colcon-metadata python3-pip + apt install -y python3-pip + pip3 install colcon-common-extensions rosdep update --rosdistro ${{ env.ROS_DISTRO }} rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y @@ -61,7 +66,11 @@ jobs: with: path: src/micro_ros_setup +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.6.1 +======= + - uses: ros-tooling/setup-ros@0.7.0 +>>>>>>> fa7c612 (Fix empy dep (#678)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -69,7 +78,8 @@ jobs: - name: dependencies run: | apt update - apt install -y python3-colcon-metadata python3-pip + apt install -y python3-pip + pip3 install colcon-common-extensions apt install -y ros-${{ env.ROS_DISTRO }}-rmw-fastrtps-cpp rosdep update --rosdistro ${{ env.ROS_DISTRO }} rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y @@ -207,7 +217,11 @@ jobs: with: path: src/micro_ros_setup +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.6.1 +======= + - uses: ros-tooling/setup-ros@0.7.0 +>>>>>>> fa7c612 (Fix empy dep (#678)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -217,7 +231,8 @@ jobs: apt update apt upgrade -y apt-get update - apt install -y python3-colcon-metadata python3-pip cmake + apt install -y python3-pip + pip3 install colcon-common-extensions cmake rosdep update --rosdistro ${{ env.ROS_DISTRO }} rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3778c3e5..478769f2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -34,7 +34,11 @@ jobs: path: src/micro_ros_setup ref: ${{ matrix.branch }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.6.1 +======= + - uses: ros-tooling/setup-ros@0.7.0 +>>>>>>> fa7c612 (Fix empy dep (#678)) with: use-ros2-testing: false required-ros-distributions: ${{ matrix.distro }} @@ -42,7 +46,8 @@ jobs: - name: Dependencies run: | apt update - apt install -y python3-colcon-metadata python3-pip + apt install -y python3-pip + pip3 install colcon-common-extensions rosdep update --rosdistro ${{ matrix.distro }} rosdep install --rosdistro ${{ matrix.distro }} -y --from-paths src --ignore-src -y @@ -528,7 +533,11 @@ jobs: path: src/micro_ros_setup ref: ${{ matrix.branch }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.6.1 +======= + - uses: ros-tooling/setup-ros@0.7.0 +>>>>>>> fa7c612 (Fix empy dep (#678)) with: use-ros2-testing: false required-ros-distributions: ${{ matrix.distro }} @@ -538,6 +547,7 @@ jobs: apt update apt upgrade -y # Install last version of CMake +<<<<<<< HEAD if [ ${{ matrix.rtos }} = "mbed" ] && [ $(lsb_release -sr) = "20.04" ]; then echo "Adding Kitware CMake repo to install latest CMake" apt install -y apt-transport-https ca-certificates gnupg software-properties-common wget @@ -548,6 +558,10 @@ jobs: fi apt-get update apt install -y python3-colcon-metadata python3-pip cmake +======= + apt install -y python3-pip + pip3 install colcon-common-extensions cmake +>>>>>>> fa7c612 (Fix empy dep (#678)) rosdep update --rosdistro ${{ matrix.distro }} rosdep install --rosdistro ${{ matrix.distro }} -y --from-paths src --ignore-src -y @@ -597,7 +611,11 @@ jobs: path: src/micro_ros_setup ref: ${{ matrix.branch }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.6.1 +======= + - uses: ros-tooling/setup-ros@0.7.0 +>>>>>>> fa7c612 (Fix empy dep (#678)) with: use-ros2-testing: false required-ros-distributions: ${{ matrix.distro }} @@ -605,7 +623,8 @@ jobs: - name: dependencies run: | apt update - apt install -y python3-colcon-metadata python3-pip + apt install -y python3-pip + pip3 install colcon-common-extensions rosdep update --rosdistro ${{ matrix.distro }} rosdep install --rosdistro ${{ matrix.distro }} -y --from-paths src --ignore-src -y apt install -y ros-${{ matrix.distro }}-rmw-fastrtps-cpp diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index 47610713..a2e11e45 100755 --- a/config/freertos/esp32/create.sh +++ b/config/freertos/esp32/create.sh @@ -26,7 +26,7 @@ pushd $FW_TARGETDIR >/dev/null . $IDF_PATH/export.sh - pip3 install catkin_pkg lark-parser empy + pip3 install catkin_pkg lark-parser colcon-common-extensions popd >/dev/null