Skip to content

Add "robot" container (backport #221) #224

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

Merged
merged 3 commits into from
Aug 5, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 5, 2024

Changes Made

The existing Dockerfile defines a "robot" stage which contains the Blue source and some deps but no other dependency repos from blue.repos. This means "robot" is not runnable "out of the box," requires multiple manual stages (vcs import ..., rosdep ..., colcon build ..., etc ) to make it runnable.

This PR:

  • Renames the "robot" stage as "blue_src_and_deps"
  • Updates "robot" to include all dependencies of "blue" and "colcon build"

The PR is opinionated:

  • That a "robot" stage should exist
  • That blue.repos should be split into separate blue_robot.repos (no ros_gz) and blue_sim.repos (adds ros_gz). Might be another way to solve this problem.

Testing

Ongoing.


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

* Initial commit of _robot container and devcontainer

* Add xacro as an exec_depend for blue_description

* Update comments

* Remove unused Docker stage "blue_src_and_deps"

Renamed *.repos --> blue.repos and sim.repos

---------

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit ba77c25)

# Conflicts:
#	blue.repos
Copy link
Author

mergify bot commented Aug 5, 2024

Cherry-pick of ba77c25 has failed:

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

You are currently cherry-picking commit ba77c25.
  (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:
	new file:   .devcontainer/robot/Dockerfile
	new file:   .devcontainer/robot/devcontainer.json
	modified:   .docker/Dockerfile
	new file:   .docker/compose/robot.yaml
	modified:   .dockerignore
	new file:   sim.repos

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   blue.repos

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 the conflicts label Aug 5, 2024
@mergify mergify bot mentioned this pull request Aug 5, 2024
@amarburg
Copy link
Collaborator

amarburg commented Aug 5, 2024

The git branch for ros_gz needs to be changed in sim.repos to "humble". I'm testing this now.

@evan-palmer evan-palmer merged commit 3b50884 into humble Aug 5, 2024
7 checks passed
@evan-palmer evan-palmer deleted the mergify/bp/humble/pr-221 branch August 5, 2024 20:43
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.

2 participants