moveit / moveit2

:robot: MoveIt for ROS 2
https://moveit.ai/
BSD 3-Clause "New" or "Revised" License
1.05k stars 512 forks source link

Add generate_parameter_library source build 0.37 until latest release is fixed (backport #2802) #2807

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 5 months ago

This PR adds generate_parameter_library as a source build to fix the current build failure. This will be needed until the latest release is fixed.


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

mergify[bot] commented 5 months ago

Cherry-pick of 1f853c36f2c0ff75d102f63a94f59346eb33d9f8 has failed:

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

You are currently cherry-picking commit 1f853c36f.
  (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:   moveit2.repos

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

stephanie-eng commented 5 months ago

@sjahr this has a merge conflict. I tried to resolve it, but I'm having trouble updating this PR - I created a new one for this case #2819

sjahr commented 4 months ago

Closed in favor of #2819