Skip to content

Fix CI (backport #826) - #834

Merged
David-LP99 merged 2 commits into
jazzyfrom
mergify/bp/jazzy/pr-826
Sep 15, 2026
Merged

David-LP99 merged 2 commits into
jazzyfrom
mergify/bp/jazzy/pr-826

Conversation

@mergify

@mergify mergify Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

Fix issues in CI:

  • ESP-IDF v4.1 tooling imports pkg_resources, which setuptools dropped in release 81. Fixed pinning the version.
  • Raspbian workspace was being built for the wrong ROS distro.
    This is an automatic backport of pull request Fix CI #826 done by Mergify.

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
(cherry picked from commit 461010c)

# Conflicts:
#	config/raspbian/generic/configure.sh
@mergify mergify Bot added the conflicts label Sep 15, 2026
@mergify

mergify Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 461010c has failed:

On branch mergify/bp/jazzy/pr-826
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 461010c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   config/freertos/esp32/create.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   config/raspbian/generic/configure.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify
mergify Bot requested a review from pablogs9 as a code owner September 15, 2026 08:54
@mergify mergify Bot added the conflicts label Sep 15, 2026
@mergify mergify Bot mentioned this pull request Sep 15, 2026
@mergify

mergify Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
@David-LP99
David-LP99 merged commit ed45678 into jazzy Sep 15, 2026
20 checks passed
@David-LP99
David-LP99 deleted the mergify/bp/jazzy/pr-826 branch September 15, 2026 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant