Skip to content

Commit d13bd7b

Browse files
Narukaramergify[bot]
authored andcommitted
fix humble dependencies issue in ci (#347)
(cherry picked from commit 267a735) # Conflicts: # .github/workflows/ci.yml
1 parent 61e2e86 commit d13bd7b

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,21 @@ jobs:
3737

3838
- name: Dependencies
3939
shell: bash
40+
env:
41+
TARGET_BRANCH: ${{ inputs.branch || github.base_ref || github.ref_name }}
4042
run: |
4143
. $IDF_PATH/export.sh
44+
<<<<<<< HEAD
4245
pip install catkin_pkg colcon-common-extensions lark "empy<4"
46+
=======
47+
echo "::notice::TARGET_BRANCH=$TARGET_BRANCH"
48+
if [ "$TARGET_BRANCH" = "humble" ]; then
49+
python3 -m pip uninstall -y em empy || true
50+
python3 -m pip install catkin_pkg colcon-common-extensions lark "empy==3.3.4"
51+
else
52+
python3 -m pip install catkin_pkg colcon-common-extensions lark
53+
fi
54+
>>>>>>> 267a735 (fix humble dependencies issue in ci (#347))
4355

4456
- name: Build sample - int32_publisher
4557
shell: bash

0 commit comments

Comments
 (0)