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 generate_parameter_library source build 0.37 until latest release is fixed (backport #2802) #2807

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 24, 2024

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.

)

Signed-off-by: Paul Gesel <paulgesel@gmail.com>
(cherry picked from commit 1f853c3)

# Conflicts:
#	moveit2.repos
@mergify mergify bot added the conflicts label Apr 24, 2024
Copy link
Author

mergify bot commented Apr 24, 2024

Cherry-pick of 1f853c3 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

@sjahr sjahr self-requested a review April 30, 2024 12:54
@stephanie-eng
Copy link
Contributor

stephanie-eng commented Apr 30, 2024

@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
Copy link
Contributor

sjahr commented May 10, 2024

Closed in favor of #2819

@sjahr sjahr closed this May 10, 2024
@rhaschke rhaschke deleted the mergify/bp/humble/pr-2802 branch May 24, 2024 12:36
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.

None yet

3 participants