Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented May 11, 2025

and branch ros2_control/ros2_controllers for jazzy


This is an automatic backport of pull request #317 done by [Mergify](https://mergify.com).

@mergify
Copy link
Author

mergify bot commented May 11, 2025

Cherry-pick of 90ba2f6 has failed:

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

You are currently cherry-picking commit 90ba2f6.
  (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:   .github/workflows/humble-source-build.yml
	modified:   .github/workflows/jazzy-source-build.yml
	modified:   .github/workflows/rolling-abi-compatibility.yml
	modified:   .github/workflows/rolling-binary-build.yml
	modified:   .github/workflows/rolling-binary-downstream-build.yml
	modified:   .github/workflows/rolling-pre-commit.yml
	modified:   .github/workflows/rolling-source-build.yml
	modified:   README.md
	new file:   realtime_tools.kilted.repos
	modified:   ros_controls.jazzy.repos
	new file:   ros_controls.kilted.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/rolling-debian-build.yml
	both modified:   .github/workflows/rolling-rhel-semi-binary-build.yml
	deleted by us:   .github/workflows/rolling-semi-binary-build.yml

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 added the conflicts label May 11, 2025
@codecov-commenter
Copy link

codecov-commenter commented May 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.63%. Comparing base (46df6ba) to head (d926cfa).

Additional details and impacted files
@@           Coverage Diff           @@
##           humble     #327   +/-   ##
=======================================
  Coverage   72.63%   72.63%           
=======================================
  Files          10       10           
  Lines         581      581           
  Branches      223      223           
=======================================
  Hits          422      422           
  Misses        105      105           
  Partials       54       54           
Flag Coverage Δ
unittests 72.63% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich force-pushed the mergify/bp/humble/pr-317 branch from 192770b to d926cfa Compare May 12, 2025 17:30
@christophfroehlich christophfroehlich changed the title Add Kilted Kaiju (backport #317) Add Kilted Kaiju (backport partially #293, #317) May 12, 2025
@christophfroehlich christophfroehlich merged commit c63aa91 into humble May 12, 2025
10 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-317 branch May 12, 2025 17:44
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.

3 participants