Skip to content

Commit 7699c47

Browse files
pablogs9Your Name
andauthored
Simplify Colcon installation (#64)
Co-authored-by: Your Name <you@example.com>
1 parent 70879ff commit 7699c47

4 files changed

Lines changed: 8 additions & 28 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,10 @@ jobs:
3333
shell: bash
3434
run: |
3535
apt update
36-
apt install lsb-release git
3736
export DEBIAN_FRONTEND=noninteractive
38-
sh -c 'echo "deb [arch=amd64,arm64] http://repo.ros2.org/ubuntu/main `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
39-
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
40-
apt update
41-
apt install -y python3-colcon-common-extensions python3-pip
37+
apt install -y git python3-pip
4238
. $IDF_PATH/export.sh
43-
pip3 install catkin_pkg lark-parser empy
39+
pip3 install catkin_pkg lark-parser empy colcon-common-extensions
4440
4541
- name: Build sample - int32_publisher
4642
shell: bash

.github/workflows/nightly.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ jobs:
3737
shell: bash
3838
run: |
3939
apt update
40-
apt install -y lsb-release git
4140
export DEBIAN_FRONTEND=noninteractive
42-
sh -c 'echo "deb [arch=amd64,arm64] http://repo.ros2.org/ubuntu/main `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
43-
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
44-
apt update
45-
apt install -y python3-colcon-common-extensions python3-pip
41+
apt install -y git python3-pip
4642
. $IDF_PATH/export.sh
47-
pip3 install catkin_pkg lark-parser empy
43+
pip3 install catkin_pkg lark-parser empy colcon-common-extensions
4844
# This line avoids the error when using Python < 3.7 https://importlib-resources.readthedocs.io/en/latest/
4945
pip3 install importlib-resources
5046

README.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,11 @@ This component has been tested in ESP-IDF v4.1, v4.2 and v4.3 with ESP32, ESP32-
44

55
## Dependencies
66

7-
This component needs `colcon` in order to build micro-ROS packages:
8-
9-
<!-- apt install lsb-release git -->
10-
```bash
11-
sudo sh -c 'echo "deb [arch=amd64,arm64] http://repo.ros2.org/ubuntu/main `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
12-
sudo curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
13-
sudo apt update
14-
sudo apt install python3-colcon-common-extensions
15-
```
16-
17-
Some python3 packages are also required inside the IDF virtual environment:
7+
This component needs `colcon` and other Python 3 packages inside the IDF virtual environment in order to build micro-ROS packages:
188

199
```bash
2010
. $IDF_PATH/export.sh
21-
pip3 install catkin_pkg lark-parser empy
11+
pip3 install catkin_pkg lark-parser empy colcon-common-extensions
2212
```
2313

2414
## Usage

docker/install_micro_ros_deps_script.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
set -eu
44

5-
sh -c 'echo "deb [arch=amd64,arm64] http://repo.ros2.org/ubuntu/main `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
6-
sudo curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
75
sudo apt update -q
8-
sudo apt install -yq python3-colcon-common-extensions
6+
sudo apt install -yq python3-pip
97
source $IDF_PATH/export.sh
10-
pip3 install catkin_pkg lark-parser empy
8+
pip3 install catkin_pkg lark-parser empy colcon-common-extensions
119

1210
set +u

0 commit comments

Comments
 (0)