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

Add missing test dependencies for ur_controllers (backport #1215) #1216

Merged
merged 4 commits into from
Dec 21, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 21, 2024

Currently, our buildfarm builds fail for Humble, but it should also be fixed for the main branch.


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

(cherry picked from commit aea2ccd)

# Conflicts:
#	ur_controllers/package.xml
@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Dec 21, 2024
Copy link
Author

mergify bot commented Dec 21, 2024

Cherry-pick of aea2ccd has failed:

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

You are currently cherry-picking commit aea2ccd.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_controllers/package.xml

no changes added to commit (use "git add" and/or "git commit -a")

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

@urfeex urfeex removed the conflicts label Dec 21, 2024
@urfeex urfeex merged commit d66c4b4 into humble Dec 21, 2024
6 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1215 branch December 21, 2024 21:15
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