Skip to content

Add Kilted Kaiju and branch for Jazzy (backport #1646) #1678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 12, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 12, 2025

and

  • branch for jazzy
  • some cleanup in the from the reusable workflows from ros2_control_ci
  • adding badges for build.ros2.org

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

(cherry picked from commit b75fe9e)

# Conflicts:
#	doc/migration.rst
#	doc/release_notes.rst
Copy link
Contributor Author

mergify bot commented May 12, 2025

Cherry-pick of b75fe9e has failed:

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

You are currently cherry-picking commit b75fe9e.
  (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/mergify.yml
	modified:   .github/workflows/humble-source-build.yml
	modified:   .github/workflows/jazzy-abi-compatibility.yml
	modified:   .github/workflows/jazzy-binary-build.yml
	modified:   .github/workflows/jazzy-check-docs.yml
	modified:   .github/workflows/jazzy-coverage-build.yml
	modified:   .github/workflows/jazzy-debian-build.yml
	modified:   .github/workflows/jazzy-pre-commit.yml
	modified:   .github/workflows/jazzy-rhel-semi-binary-build.yml
	modified:   .github/workflows/jazzy-semi-binary-build.yml
	modified:   .github/workflows/jazzy-semi-binary-downstream-build.yml
	modified:   .github/workflows/jazzy-source-build.yml
	modified:   .github/workflows/rolling-abi-compatibility.yml
	modified:   .github/workflows/rolling-binary-build.yml
	new file:   .github/workflows/rolling-compatibility-kilted-binary-build.yml
	modified:   .github/workflows/rolling-debian-build.yml
	modified:   .github/workflows/rolling-pre-commit.yml
	modified:   .github/workflows/rolling-rhel-semi-binary-build.yml
	modified:   .github/workflows/rolling-semi-binary-build.yml
	modified:   .github/workflows/rolling-semi-binary-downstream-build.yml
	modified:   .github/workflows/rolling-source-build.yml
	modified:   README.md
	new file:   downstream.kilted.repos
	new file:   ros2_controllers-not-released.kilted.repos
	modified:   ros2_controllers.jazzy.repos
	new file:   ros2_controllers.kilted.repos
	new file:   ros_controls.kilted.repos

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/migration.rst
	both modified:   doc/release_notes.rst

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 12, 2025
@christophfroehlich christophfroehlich changed the title Add Kilted Kaiju (backport #1646) Add Kilted Kaiju and branch for Jazzy (backport #1646) May 12, 2025
@christophfroehlich christophfroehlich merged commit 5090d28 into humble May 12, 2025
3 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1646 branch May 12, 2025 19:09
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