Skip to content

Add kilted info and update workflows (backport #809) #810

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 2 commits into from
May 22, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 21, 2025

and some cleanup + linting


This is an automatic backport of pull request #809 done by Mergify.

(cherry picked from commit 5677534)

# Conflicts:
#	ros2_control_demos.jazzy.repos
#	ros2_control_demos.rolling.repos
@mergify mergify bot added the conflicts label May 21, 2025
Copy link
Contributor Author

mergify bot commented May 21, 2025

Cherry-pick of 5677534 has failed:

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

You are currently cherry-picking commit 5677534.
  (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-semi-binary-build.yml
	modified:   .github/workflows/rolling-binary-build.yml
	modified:   .github/workflows/rolling-docker-build.yaml
	modified:   .github/workflows/rolling-pre-commit.yml
	modified:   .github/workflows/rolling-semi-binary-build.yml
	modified:   README.md
	new file:   ros2_control_demos-not-released.kilted.repos
	modified:   ros2_control_demos.humble.repos
	new file:   ros2_control_demos.kilted.repos

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros2_control_demos.jazzy.repos
	both modified:   ros2_control_demos.rolling.repos

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

@christophfroehlich christophfroehlich merged commit 252f4a6 into humble May 22, 2025
6 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-809 branch May 22, 2025 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant