Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken rosidl_cli (backport #726) #727

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ jobs:
path: src/micro_ros_setup
ref: ${{ inputs.ci_target_ref }}

<<<<<<< HEAD
- uses: ros-tooling/[email protected]
=======
- uses: ros-tooling/[email protected]
>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
with:
use-ros2-testing: false
required-ros-distributions: ${{ env.ROS_DISTRO }}
Expand Down Expand Up @@ -65,7 +69,11 @@ jobs:
path: src/micro_ros_setup
ref: ${{ inputs.ci_target_ref }}

<<<<<<< HEAD
- uses: ros-tooling/[email protected]
=======
- uses: ros-tooling/[email protected]
>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
with:
use-ros2-testing: false
required-ros-distributions: ${{ env.ROS_DISTRO }}
Expand Down Expand Up @@ -213,7 +221,11 @@ jobs:
path: src/micro_ros_setup
ref: ${{ inputs.ci_target_ref }}

<<<<<<< HEAD
- uses: ros-tooling/[email protected]
=======
- uses: ros-tooling/[email protected]
>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
with:
use-ros2-testing: false
required-ros-distributions: ${{ env.ROS_DISTRO }}
Expand Down
3 changes: 3 additions & 0 deletions config/freertos/esp32/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
EXTENSIONS_DIR=$FW_TARGETDIR/freertos_apps/microros_esp32_extensions

# Source virtualenv
source $FW_TARGETDIR/venv/bin/activate

. $PREFIX/config/utils.sh

export IDF_TOOLS_PATH=$FW_TARGETDIR/toolchain/espressif
Expand Down
12 changes: 12 additions & 0 deletions config/freertos/esp32/create.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
pushd $FW_TARGETDIR >/dev/null
# Create a virtual environment
python3 -m venv $FW_TARGETDIR/venv
source $FW_TARGETDIR/venv/bin/activate

# Install deps
pip3 install catkin_pkg empy lark-parser colcon-common-extensions

pip3 install virtualenv

# Install toolchain
mkdir toolchain

Expand All @@ -19,7 +28,10 @@ pushd $FW_TARGETDIR >/dev/null
echo "Error: python3-pip package must be installed before continuing..."
exit 1
fi
<<<<<<< HEAD
pip3 install virtualenv
=======
>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
python3 esp-idf/tools/idf_tools.py install-python-env

eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
Expand Down
3 changes: 3 additions & 0 deletions config/freertos/esp32/flash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ EXTENSIONS_DIR=$FW_TARGETDIR/freertos_apps/microros_esp32_extensions
export IDF_TOOLS_PATH=$FW_TARGETDIR/toolchain/espressif
export IDF_PATH=$FW_TARGETDIR/toolchain/esp-idf

# Source virtualenv
source $FW_TARGETDIR/venv/bin/activate

eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system)

. $IDF_PATH/export.sh
Expand Down
2 changes: 2 additions & 0 deletions config/zephyr/generic/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
. $PREFIX/config/utils.sh

pushd $FW_TARGETDIR >/dev/null
source $FW_TARGETDIR/venv/bin/activate

source $FW_TARGETDIR/zephyrproject/zephyr/zephyr-env.sh

export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
Expand Down
13 changes: 13 additions & 0 deletions config/zephyr/generic/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@ export PATH=~/.local/bin:"$PATH"
export ZEPHYR_VERSION="v0.12.4"
export ARCH=$(uname -m)

<<<<<<< HEAD
=======
# Create a virtual environment
python3 -m venv $FW_TARGETDIR/venv
source $FW_TARGETDIR/venv/bin/activate

# Install west
pip3 install west

# Install requirements
pip3 install catkin_pkg empy

>>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
pushd $FW_TARGETDIR >/dev/null

west init zephyrproject
Expand Down
2 changes: 2 additions & 0 deletions config/zephyr/generic/flash.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
pushd $FW_TARGETDIR > /dev/null

source $FW_TARGETDIR/venv/bin/activate

ZEPHYR_BUILD_DIR="$FW_TARGETDIR/build/zephyr"

# Host platform (=native_posix) is special, as flashing is actually just executing the binary
Expand Down
1 change: 1 addition & 0 deletions config/zephyr/generic/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<build_depend>gcc-multilib</build_depend>
<build_depend>g++-multilib</build_depend>
<build_depend>openocd</build_depend>
<build_depend>python3-venv</build_depend>

<build_depend>python3-west-pip</build_depend>

Expand Down