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

Update installation instructions for source build (backport #967) #970

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 15, 2024

I think there is some information missing, if someone wants to build the driver from source on a non-rolling ROS distro.

Relates to https://robotics.stackexchange.com/questions/110644/ros2-ur-driver-package-failed-ur-controllers/110654#110654


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

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

mergify bot commented Apr 15, 2024

Cherry-pick of 2d5e315 has failed:

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

You are currently cherry-picking commit 2d5e315.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ur_robot_driver/doc/installation/installation.rst

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

@fmauch
Copy link
Collaborator

fmauch commented Apr 15, 2024

Seems like for humble we never restructured things that much, see #884

* Update installation.rst

* Fix git command

(cherry picked from commit 2d5e315)
@fmauch fmauch removed the conflicts label Apr 16, 2024
@fmauch fmauch merged commit 9976bd4 into humble Apr 16, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-967 branch April 16, 2024 12:17
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.

2 participants