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

Remove dependency to docker.io (backport #985) #987

Merged
merged 1 commit into from
May 7, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 7, 2024

The dependency was basically added since this is needed to spawn up ursim. However, the start_ursim script catches the case that no docker executable is available and the tests requiring it are behind a compile definition which is off by default.

So, in order to not install docker for users automatically, the dependency shall be removed.

As a side-effect this has always stopped us from releasing the package for RHEL.

This closes #769


This is an automatic backport of pull request #985 done by [Mergify](https://mergify.com).

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

mergify bot commented May 7, 2024

Cherry-pick of 585e29f has failed:

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

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

Changes to be committed:
	modified:   ur_robot_driver/package.xml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/reusable_ici.yml

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

* Remove dependency to docker.io

The dependency was basically added since this is needed to spawn up
ursim. However, the start_ursim script catches the case that no docker
executable is available and the tests requiring it are behind a compile
definition which is off by default.

So, in order to not install docker for users automatically, the dependency
shall be removed.

(cherry picked from commit 585e29f)
@fmauch fmauch force-pushed the mergify/bp/humble/pr-985 branch from e87624c to beeb8fa Compare May 7, 2024 11:58
@fmauch fmauch removed the conflicts label May 7, 2024
Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good although I ask myself, why we don't use the reusable ici on the humble branch.

@fmauch fmauch merged commit da01094 into humble May 7, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-985 branch May 7, 2024 15:20
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