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

Fix passing launch_dashobard_client launch argument (backport #1057) #1059

Merged
merged 1 commit into from
Jul 26, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 17, 2024

This was not handled properly.

This fixes #1056

ToDo:

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Jul 17, 2024
Copy link
Author

mergify bot commented Jul 17, 2024

Cherry-pick of ca19535 has failed:

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

You are currently cherry-picking commit ca19535.
  (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:   ur_robot_driver/CMakeLists.txt
	new file:   ur_robot_driver/test/launch_args.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/launch/ur_control.launch.py
	both modified:   ur_robot_driver/test/test_common.py

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

@fmauch fmauch force-pushed the mergify/bp/humble/pr-1057 branch from c4cfaa2 to b9b1780 Compare July 26, 2024 12:00
@fmauch fmauch removed the conflicts label Jul 26, 2024
Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicts are resolved, ready to ship it unless the CI opposes.

* Fix passing launch_dashobard_client launch argument
   This was not handled properly
* Do start dashboard_client in driver_test
* Add test for checking launch_dashboard_client argument

(cherry picked from commit ca19535)
@fmauch fmauch force-pushed the mergify/bp/humble/pr-1057 branch from b9b1780 to d440bf1 Compare July 26, 2024 12:05
@fmauch fmauch merged commit 4c27830 into humble Jul 26, 2024
5 of 6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-1057 branch July 26, 2024 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Relevant for humble and higher ROS versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant