Fix empy dep (#678)

* Fix empy dep * Fix * Install colcon * Fix (cherry picked from commit fa7c612) # Conflicts: # .github/workflows/ci.yml # .github/workflows/nightly.yml
micro-ROS · Dec 1, 2023 · 0a9508e · 0a9508e
1 parent 58dc7f8
commit 0a9508e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,15 +22,20 @@ jobs:
         with:
           path: src/micro_ros_setup
 
+<<<<<<< HEAD
       - uses: ros-tooling/[email protected]
+=======
+      - uses: ros-tooling/[email protected]
+>>>>>>> fa7c612 (Fix empy dep (#678))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
 
       - 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,15 +66,20 @@ jobs:
         with:
           path: src/micro_ros_setup
 
+<<<<<<< HEAD
       - uses: ros-tooling/[email protected]
+=======
+      - uses: ros-tooling/[email protected]
+>>>>>>> fa7c612 (Fix empy dep (#678))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
 
       - 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/[email protected]
+=======
+      - uses: ros-tooling/[email protected]
+>>>>>>> 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
@@ -34,15 +34,20 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ matrix.branch }}
 
+<<<<<<< HEAD
       - uses: ros-tooling/[email protected]
+=======
+      - uses: ros-tooling/[email protected]
+>>>>>>> fa7c612 (Fix empy dep (#678))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.distro }}
 
       - 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/[email protected]
+=======
+      - uses: ros-tooling/[email protected]
+>>>>>>> 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,15 +611,20 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ matrix.branch }}
 
+<<<<<<< HEAD
       - uses: ros-tooling/[email protected]
+=======
+      - uses: ros-tooling/[email protected]
+>>>>>>> fa7c612 (Fix empy dep (#678))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.distro }}
 
       - 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
@@ -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