From 961d28421b8d8171d9e5c66b1448906cfe122847 Mon Sep 17 00:00:00 2001 From: Narukara Date: Wed, 27 May 2026 19:01:03 +0800 Subject: [PATCH 1/2] fix humble dependencies issue in ci (#347) (cherry picked from commit 267a73502c60c08f544f2069faf9875fbe303c06) # Conflicts: # .github/workflows/ci.yml --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e012e9c..a2dfc959 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,9 +40,21 @@ jobs: - name: Dependencies shell: bash + env: + TARGET_BRANCH: ${{ inputs.branch || github.base_ref || github.ref_name }} run: | . $IDF_PATH/export.sh +<<<<<<< HEAD pip install catkin_pkg colcon-common-extensions lark "empy<4" +======= + echo "::notice::TARGET_BRANCH=$TARGET_BRANCH" + if [ "$TARGET_BRANCH" = "humble" ]; then + python3 -m pip uninstall -y em empy || true + python3 -m pip install catkin_pkg colcon-common-extensions lark "empy==3.3.4" + else + python3 -m pip install catkin_pkg colcon-common-extensions lark + fi +>>>>>>> 267a735 (fix humble dependencies issue in ci (#347)) - name: Build sample - int32_publisher shell: bash From e22b812bf91597c49e76898033696c0f03dbfb1b Mon Sep 17 00:00:00 2001 From: Aarav Gupta Date: Wed, 27 May 2026 19:52:01 +0530 Subject: [PATCH 2/2] Fix conflicts in ci.yml --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2dfc959..90b927a6 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,9 +44,6 @@ jobs: TARGET_BRANCH: ${{ inputs.branch || github.base_ref || github.ref_name }} run: | . $IDF_PATH/export.sh -<<<<<<< HEAD - pip install catkin_pkg colcon-common-extensions lark "empy<4" -======= echo "::notice::TARGET_BRANCH=$TARGET_BRANCH" if [ "$TARGET_BRANCH" = "humble" ]; then python3 -m pip uninstall -y em empy || true @@ -54,7 +51,6 @@ jobs: else python3 -m pip install catkin_pkg colcon-common-extensions lark fi ->>>>>>> 267a735 (fix humble dependencies issue in ci (#347)) - name: Build sample - int32_publisher shell: bash