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 how to build the doc with devcontainer. (backport #4757) #4811

Open
wants to merge 1 commit into
base: humble
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2024

closes #4497


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

* add how to build the doc with devcontainer.

* use venv instead of virtualenv.

* add venv to the official doc build procedure.

Signed-off-by: Tomoya Fujita <[email protected]>
(cherry picked from commit fcf9bc5)

# Conflicts:
#	.devcontainer/devcontainer.json
#	source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst
Copy link
Contributor Author

mergify bot commented Oct 8, 2024

Cherry-pick of fcf9bc5 has failed:

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

You are currently cherry-picking commit fcf9bc50.
  (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:   README.md
	modified:   docker/image/Dockerfile
	new file:   source/The-ROS2-Project/Contributing/images/vscode_devcontainer.png

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .devcontainer/devcontainer.json
	both modified:   source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst

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 Oct 8, 2024
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.

1 participant