Skip to content

Fix CI - #826

Merged
EugenioCollado merged 1 commit into
kiltedfrom
update/fix_CI
Aug 11, 2026
Merged

Fix CI#826
EugenioCollado merged 1 commit into
kiltedfrom
update/fix_CI

Conversation

@David-LP99

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.

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
@David-LP99
David-LP99 requested a review from pablogs9 as a code owner August 11, 2026 08:27
@mergify

mergify Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

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

  • Queue this pull request

@EugenioCollado
EugenioCollado merged commit 461010c into kilted Aug 11, 2026
20 checks passed
@EugenioCollado
EugenioCollado deleted the update/fix_CI branch August 11, 2026 09:05
@David-LP99

Copy link
Copy Markdown
Contributor Author

@mergify backport rolling

@mergify

mergify Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

backport rolling

✅ Backports have been created

Details

@mergify mergify Bot mentioned this pull request Sep 14, 2026
David-LP99 added a commit that referenced this pull request Sep 14, 2026
(cherry picked from commit 461010c)

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
Co-authored-by: David-LP99 <davidlaseca@eprosima.com>
@David-LP99

Copy link
Copy Markdown
Contributor Author

@mergify backport jazzy humble

@mergify

mergify Bot commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

backport jazzy humble

✅ Backports have been created

Details

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

Cherry-pick of 461010c has failed:

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

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

This was referenced Sep 15, 2026
David-LP99 added a commit that referenced this pull request Sep 15, 2026
* Fix CI (#826)

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

# Conflicts:
#	config/raspbian/generic/configure.sh

* Adapt fix for jazzy

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>

---------

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
Co-authored-by: David-LP99 <davidlaseca@eprosima.com>
David-LP99 added a commit that referenced this pull request Sep 15, 2026
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
Co-authored-by: David-LP99 <davidlaseca@eprosima.com>
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.

2 participants