Skip to content
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

Generate version header using ament_generate_version_header(..) (backport #1141) #1145

Merged
merged 2 commits into from
May 26, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 30, 2024

Would fix #1139.


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

Signed-off-by: gavanderhoorn <g.a.vanderhoorn@tudelft.nl>
(cherry picked from commit 5766d5e)

# Conflicts:
#	rcl/CMakeLists.txt
#	rcl_action/CMakeLists.txt
#	rcl_lifecycle/CMakeLists.txt
#	rcl_yaml_param_parser/CMakeLists.txt
@mergify mergify bot added the conflicts label Mar 30, 2024
Copy link
Author

mergify bot commented Mar 30, 2024

Cherry-pick of 5766d5e has failed:

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

You are currently cherry-picking commit 5766d5e.
  (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:   rcl/package.xml
	modified:   rcl_action/package.xml
	modified:   rcl_lifecycle/package.xml
	modified:   rcl_yaml_param_parser/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rcl/CMakeLists.txt
	both modified:   rcl_action/CMakeLists.txt
	both modified:   rcl_lifecycle/CMakeLists.txt
	both modified:   rcl_yaml_param_parser/CMakeLists.txt

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

Signed-off-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
@fujitatomoya
Copy link
Collaborator

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@gavanderhoorn
Copy link
Contributor

Friendly ping?

@fujitatomoya fujitatomoya merged commit 135d8c1 into humble May 26, 2024
2 of 3 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1141 branch May 26, 2024 19:32
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.

2 participants