File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2424 path : src/micro_ros_setup
2525 ref : ${{ inputs.ci_target_ref }}
2626
27- - uses : ros-tooling/setup-ros@0.7.7
27+ - uses : ros-tooling/setup-ros@0.7.9
2828 with :
2929 use-ros2-testing : false
3030 required-ros-distributions : ${{ env.ROS_DISTRO }}
6363 path : src/micro_ros_setup
6464 ref : ${{ inputs.ci_target_ref }}
6565
66- - uses : ros-tooling/setup-ros@0.7.7
66+ - uses : ros-tooling/setup-ros@0.7.9
6767 with :
6868 use-ros2-testing : false
6969 required-ros-distributions : ${{ env.ROS_DISTRO }}
@@ -205,7 +205,7 @@ jobs:
205205 path : src/micro_ros_setup
206206 ref : ${{ inputs.ci_target_ref }}
207207
208- - uses : ros-tooling/setup-ros@0.7.7
208+ - uses : ros-tooling/setup-ros@0.7.9
209209 with :
210210 use-ros2-testing : false
211211 required-ros-distributions : ${{ env.ROS_DISTRO }}
Original file line number Diff line number Diff line change 11EXTENSIONS_DIR=$FW_TARGETDIR /freertos_apps/microros_esp32_extensions
22
3+ # Source virtualenv
4+ source $FW_TARGETDIR /venv/bin/activate
5+
36. $PREFIX /config/utils.sh
47
58export IDF_TOOLS_PATH=$FW_TARGETDIR /toolchain/espressif
Original file line number Diff line number Diff line change 11pushd $FW_TARGETDIR > /dev/null
2+ # Create a virtual environment
3+ python3 -m venv $FW_TARGETDIR /venv
4+ source $FW_TARGETDIR /venv/bin/activate
5+
6+ # Install deps
7+ pip3 install catkin_pkg empy lark-parser colcon-common-extensions
8+
9+ pip3 install virtualenv
10+
211 # Install toolchain
312 mkdir toolchain
413
@@ -19,14 +28,13 @@ pushd $FW_TARGETDIR >/dev/null
1928 echo " Error: python3-pip package must be installed before continuing..."
2029 exit 1
2130 fi
22- pip3 install virtualenv --break-system-packages
2331 python3 esp-idf/tools/idf_tools.py install-python-env
2432
2533 eval $( python3 $FW_TARGETDIR /toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
2634
2735 . $IDF_PATH /export.sh
2836
29- pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages
37+ pip3 install catkin_pkg lark-parser colcon-common-extensions
3038
3139 popd > /dev/null
3240
Original file line number Diff line number Diff line change @@ -3,6 +3,9 @@ EXTENSIONS_DIR=$FW_TARGETDIR/freertos_apps/microros_esp32_extensions
33export IDF_TOOLS_PATH=$FW_TARGETDIR /toolchain/espressif
44export IDF_PATH=$FW_TARGETDIR /toolchain/esp-idf
55
6+ # Source virtualenv
7+ source $FW_TARGETDIR /venv/bin/activate
8+
69eval $( python3 $FW_TARGETDIR /toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
710
811. $IDF_PATH /export.sh
Original file line number Diff line number Diff line change 11. $PREFIX /config/utils.sh
22
33pushd $FW_TARGETDIR > /dev/null
4+ source $FW_TARGETDIR /venv/bin/activate
5+
46 source $FW_TARGETDIR /zephyrproject/zephyr/zephyr-env.sh
57
68 export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
Original file line number Diff line number Diff line change @@ -18,8 +18,15 @@ export PATH=~/.local/bin:"$PATH"
1818export ZEPHYR_VERSION=" v0.12.4"
1919export ARCH=$( uname -m)
2020
21+ # Create a virtual environment
22+ python3 -m venv $FW_TARGETDIR /venv
23+ source $FW_TARGETDIR /venv/bin/activate
24+
2125# Install west
22- pip3 install --user -U west --break-system-packages
26+ pip3 install west
27+
28+ # Install requirements
29+ pip3 install catkin_pkg empy
2330
2431pushd $FW_TARGETDIR > /dev/null
2532
@@ -31,7 +38,7 @@ pushd $FW_TARGETDIR >/dev/null
3138 west update
3239 popd > /dev/null
3340
34- pip3 install -r zephyrproject/zephyr/scripts/requirements.txt --ignore-installed --break-system-packages
41+ pip3 install -r zephyrproject/zephyr/scripts/requirements.txt --ignore-installed
3542
3643 if [ " $PLATFORM " = " host" ]; then
3744 if [ " $ARCH " = " aarch64" ]; then
@@ -72,6 +79,6 @@ pushd $FW_TARGETDIR >/dev/null
7279 touch mcu_ws/ros2/ros2_tracing/lttngpy/COLCON_IGNORE
7380
7481 # Upgrade sphinx
75- pip install --force-reinstall Sphinx==4.2.0 --break-system-packages
82+ pip install --force-reinstall Sphinx==4.2.0
7683
7784popd > /dev/null
Original file line number Diff line number Diff line change 11pushd $FW_TARGETDIR > /dev/null
22
3+ source $FW_TARGETDIR /venv/bin/activate
4+
35ZEPHYR_BUILD_DIR=" $FW_TARGETDIR /build/zephyr"
46
57# Host platform (=native_posix) is special, as flashing is actually just executing the binary
Original file line number Diff line number Diff line change 1515 <build_depend >gcc-multilib</build_depend >
1616 <build_depend >g++-multilib</build_depend >
1717 <build_depend >openocd</build_depend >
18+ <build_depend >python3-venv</build_depend >
1819
1920</package >
You can’t perform that action at this time.
0 commit comments