Skip to content

Commit d153292

Browse files
Fix empy dep (#678) (#680)
* Fix empy dep * Fix * Install colcon * Fix (cherry picked from commit fa7c612) Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
1 parent a20c5dc commit d153292

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ jobs:
2222
with:
2323
path: src/micro_ros_setup
2424

25-
- uses: ros-tooling/setup-ros@0.6.2
25+
- uses: ros-tooling/setup-ros@0.7.0
2626
with:
2727
use-ros2-testing: false
2828
required-ros-distributions: ${{ env.ROS_DISTRO }}
2929

3030
- name: Dependencies
3131
run: |
3232
apt update
33-
apt install -y python3-colcon-metadata python3-pip
33+
apt install -y python3-pip
34+
pip3 install colcon-common-extensions
3435
rosdep update --rosdistro ${{ env.ROS_DISTRO }}
3536
rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
3637
@@ -61,15 +62,16 @@ jobs:
6162
with:
6263
path: src/micro_ros_setup
6364

64-
- uses: ros-tooling/setup-ros@0.6.2
65+
- uses: ros-tooling/setup-ros@0.7.0
6566
with:
6667
use-ros2-testing: false
6768
required-ros-distributions: ${{ env.ROS_DISTRO }}
6869

6970
- name: dependencies
7071
run: |
7172
apt update
72-
apt install -y python3-colcon-metadata python3-pip
73+
apt install -y python3-pip
74+
pip3 install colcon-common-extensions
7375
apt install -y ros-${{ env.ROS_DISTRO }}-rmw-fastrtps-cpp
7476
rosdep update --rosdistro ${{ env.ROS_DISTRO }}
7577
rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
@@ -207,7 +209,7 @@ jobs:
207209
with:
208210
path: src/micro_ros_setup
209211

210-
- uses: ros-tooling/setup-ros@0.6.2
212+
- uses: ros-tooling/setup-ros@0.7.0
211213
with:
212214
use-ros2-testing: false
213215
required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -217,7 +219,8 @@ jobs:
217219
apt update
218220
apt upgrade -y
219221
apt-get update
220-
apt install -y python3-colcon-metadata python3-pip cmake
222+
apt install -y python3-pip
223+
pip3 install colcon-common-extensions cmake
221224
rosdep update --rosdistro ${{ env.ROS_DISTRO }}
222225
rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
223226

.github/workflows/nightly.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,16 @@ jobs:
3434
path: src/micro_ros_setup
3535
ref: ${{ matrix.branch }}
3636

37-
- uses: ros-tooling/setup-ros@0.6.2
37+
- uses: ros-tooling/setup-ros@0.7.0
3838
with:
3939
use-ros2-testing: false
4040
required-ros-distributions: ${{ matrix.distro }}
4141

4242
- name: Dependencies
4343
run: |
4444
apt update
45-
apt install -y python3-colcon-metadata python3-pip
45+
apt install -y python3-pip
46+
pip3 install colcon-common-extensions
4647
rosdep update --rosdistro ${{ matrix.distro }}
4748
rosdep install --rosdistro ${{ matrix.distro }} -y --from-paths src --ignore-src -y
4849
@@ -526,7 +527,7 @@ jobs:
526527
path: src/micro_ros_setup
527528
ref: ${{ matrix.branch }}
528529

529-
- uses: ros-tooling/setup-ros@0.6.2
530+
- uses: ros-tooling/setup-ros@0.7.0
530531
with:
531532
use-ros2-testing: false
532533
required-ros-distributions: ${{ matrix.distro }}
@@ -536,7 +537,8 @@ jobs:
536537
apt update
537538
apt upgrade -y
538539
# Install last version of CMake
539-
apt install -y python3-colcon-metadata python3-pip cmake
540+
apt install -y python3-pip
541+
pip3 install colcon-common-extensions cmake
540542
rosdep update --rosdistro ${{ matrix.distro }}
541543
rosdep install --rosdistro ${{ matrix.distro }} -y --from-paths src --ignore-src -y
542544
@@ -586,15 +588,16 @@ jobs:
586588
path: src/micro_ros_setup
587589
ref: ${{ matrix.branch }}
588590

589-
- uses: ros-tooling/setup-ros@0.6.2
591+
- uses: ros-tooling/setup-ros@0.7.0
590592
with:
591593
use-ros2-testing: false
592594
required-ros-distributions: ${{ matrix.distro }}
593595

594596
- name: dependencies
595597
run: |
596598
apt update
597-
apt install -y python3-colcon-metadata python3-pip
599+
apt install -y python3-pip
600+
pip3 install colcon-common-extensions
598601
rosdep update --rosdistro ${{ matrix.distro }}
599602
rosdep install --rosdistro ${{ matrix.distro }} -y --from-paths src --ignore-src -y
600603
apt install -y ros-${{ matrix.distro }}-rmw-fastrtps-cpp

config/freertos/esp32/create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pushd $FW_TARGETDIR >/dev/null
2626

2727
. $IDF_PATH/export.sh
2828

29-
pip3 install catkin_pkg lark-parser empy
29+
pip3 install catkin_pkg lark-parser colcon-common-extensions
3030

3131
popd >/dev/null
3232

0 commit comments

Comments
 (0)