From 290b9edd88026f9386d219dcd3e198499e5c6ec0 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 1 Dec 2023 07:48:04 +0100 Subject: [PATCH 1/4] Fix empy dep --- .github/workflows/ci.yml | 15 +++++++++------ .github/workflows/nightly.yml | 15 +++++++++------ config/freertos/esp32/create.sh | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 294f4cdd..b301e81d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: with: path: src/micro_ros_setup - - uses: ros-tooling/setup-ros@0.6.2 + - uses: ros-tooling/setup-ros@0.7.0 with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -30,7 +30,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 +62,7 @@ jobs: with: path: src/micro_ros_setup - - uses: ros-tooling/setup-ros@0.6.2 + - uses: ros-tooling/setup-ros@0.7.0 with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -69,7 +70,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 +209,7 @@ jobs: with: path: src/micro_ros_setup - - uses: ros-tooling/setup-ros@0.6.2 + - uses: ros-tooling/setup-ros@0.7.0 with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -217,7 +219,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 48eaadad..70c178eb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -34,7 +34,7 @@ jobs: path: src/micro_ros_setup ref: ${{ matrix.branch }} - - uses: ros-tooling/setup-ros@0.6.2 + - uses: ros-tooling/setup-ros@0.7.0 with: use-ros2-testing: false required-ros-distributions: ${{ matrix.distro }} @@ -42,7 +42,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 @@ -526,7 +527,7 @@ jobs: path: src/micro_ros_setup ref: ${{ matrix.branch }} - - uses: ros-tooling/setup-ros@0.6.2 + - uses: ros-tooling/setup-ros@0.7.0 with: use-ros2-testing: false required-ros-distributions: ${{ matrix.distro }} @@ -536,7 +537,8 @@ jobs: apt update apt upgrade -y # Install last version of CMake - apt install -y python3-colcon-metadata python3-pip cmake + apt install -y python3-pip + pip3 install colcon-common-extensions cmake rosdep update --rosdistro ${{ matrix.distro }} rosdep install --rosdistro ${{ matrix.distro }} -y --from-paths src --ignore-src -y @@ -586,7 +588,7 @@ jobs: path: src/micro_ros_setup ref: ${{ matrix.branch }} - - uses: ros-tooling/setup-ros@0.6.2 + - uses: ros-tooling/setup-ros@0.7.0 with: use-ros2-testing: false required-ros-distributions: ${{ matrix.distro }} @@ -594,7 +596,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 ecc76652..f9443c53 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 popd >/dev/null From 5b1278ae801a6d9327dc2daab15ba658da00beac Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 1 Dec 2023 08:12:19 +0100 Subject: [PATCH 2/4] Fix --- config/freertos/esp32/create.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index f9443c53..ecc76652 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 + pip3 install catkin_pkg lark-parser empy popd >/dev/null From 55f385f3d18cde0c25c39da9a843b28b3cd5d9fa Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 1 Dec 2023 08:49:57 +0100 Subject: [PATCH 3/4] Install colcon --- config/freertos/esp32/create.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index ecc76652..f8c6ea09 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 colcon-common-extensions popd >/dev/null From db0b1fddb3972b8fc9f1de547d8f35ecc09c3180 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 1 Dec 2023 09:12:20 +0100 Subject: [PATCH 4/4] Fix --- config/freertos/esp32/create.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh index f8c6ea09..3d0471e5 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 colcon-common-extensions + pip3 install catkin_pkg lark-parser colcon-common-extensions popd >/dev/null