Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 2, 2025

The upstream API changed, so we have to follow.


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

The upstream API changed, so we have to follow.

(cherry picked from commit 6a3be3f)

# Conflicts:
#	ur_controllers/src/scaled_joint_trajectory_controller.cpp
@mergify
Copy link
Author

mergify bot commented Jun 2, 2025

Cherry-pick of 6a3be3f has failed:

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

You are currently cherry-picking commit 6a3be3f.
  (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/src/scaled_joint_trajectory_controller.cpp

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

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Jun 2, 2025
@urfeex urfeex removed the conflicts label Jun 2, 2025
@christophfroehlich
Copy link
Contributor

I merged this upstream in ros2_controllers now.

@urfeex urfeex merged commit 4aae71e into humble Jun 5, 2025
5 of 9 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1385 branch June 5, 2025 19:21
@christophebedard
Copy link

christophebedard commented Jun 10, 2025

I think a new Humble release (with this fix) is needed. The ur_controllers Hbin job is currently failing: https://build.ros2.org/view/Hbin_uJ64/job/Hbin_uJ64__ur_controllers__ubuntu_jammy_amd64__binary/251/console.

I plan to sync Humble in the next few days.

@urfeex
Copy link
Member

urfeex commented Jun 11, 2025

I think a new Humble release (with this fix) is needed. The ur_controllers Hbin job is currently failing: https://build.ros2.org/view/Hbin_uJ64/job/Hbin_uJ64__ur_controllers__ubuntu_jammy_amd64__binary/251/console.

I plan to sync Humble in the next few days.

I was waiting for that to happen before releasing a new package. Will do that rightaway.

@urfeex urfeex mentioned this pull request Jun 11, 2025
u-decs pushed a commit to u-decs/Universal_Robots_ROS2_Driver that referenced this pull request Jun 17, 2025
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.

3 participants