Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 1, 2025

This change should hopefully fix #872.
Basically I am updating all the CMakeLists.txt files to use "add_ros_isolated_launch_test" for the launch tests as mentioned in
https://docs.ros.org/en/rolling/Tutorials/Intermediate/Testing/Integration.html

I ran the tests locally and they all passed.


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

* Update CMakeLists.txt to use add_ros_isolated_launch_test

* add missing dependencies to package.xml

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 8a3eb93)

# Conflicts:
#	example_1/package.xml
#	example_10/package.xml
#	example_11/package.xml
#	example_12/package.xml
#	example_14/package.xml
#	example_15/package.xml
#	example_16/CMakeLists.txt
#	example_16/package.xml
#	example_17/CMakeLists.txt
#	example_17/package.xml
#	example_2/package.xml
#	example_3/package.xml
#	example_4/package.xml
#	example_5/package.xml
#	example_6/package.xml
#	example_7/package.xml
#	example_8/package.xml
#	example_9/package.xml
Copy link
Contributor Author

mergify bot commented Oct 1, 2025

Cherry-pick of 8a3eb93 has failed:

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

You are currently cherry-picking commit 8a3eb93.
  (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:   example_1/CMakeLists.txt
	modified:   example_10/CMakeLists.txt
	modified:   example_11/CMakeLists.txt
	modified:   example_12/CMakeLists.txt
	modified:   example_14/CMakeLists.txt
	modified:   example_15/CMakeLists.txt
	modified:   example_2/CMakeLists.txt
	modified:   example_3/CMakeLists.txt
	modified:   example_4/CMakeLists.txt
	modified:   example_5/CMakeLists.txt
	modified:   example_6/CMakeLists.txt
	modified:   example_7/CMakeLists.txt
	modified:   example_8/CMakeLists.txt
	modified:   example_9/CMakeLists.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   example_1/package.xml
	both modified:   example_10/package.xml
	both modified:   example_11/package.xml
	both modified:   example_12/package.xml
	both modified:   example_14/package.xml
	both modified:   example_15/package.xml
	deleted by us:   example_16/CMakeLists.txt
	deleted by us:   example_16/package.xml
	deleted by us:   example_17/CMakeLists.txt
	deleted by us:   example_17/package.xml
	both modified:   example_2/package.xml
	both modified:   example_3/package.xml
	both modified:   example_4/package.xml
	both modified:   example_5/package.xml
	both modified:   example_6/package.xml
	both modified:   example_7/package.xml
	both modified:   example_8/package.xml
	both modified:   example_9/package.xml

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 Oct 1, 2025
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