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

ROS2-Tracing-Trace-and-Analyze fix for iron tutorial (backport #4675) #4678

Merged
merged 1 commit into from
Aug 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2024

Matching iron branch of tracetools_analysis repository must be cloned.

If the default master branch is used instead, the follow-up rosdep install --from-paths src --ignore-src -y command will fail and return a seemingly unrelated error message:

test_ros2trace_analysis: Cannot locate rosdep definition for [test_tracetools]


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

Copy link
Contributor Author

mergify bot commented Aug 23, 2024

Cherry-pick of cb5e7dc has failed:

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

You are currently cherry-picking commit cb5e7dc8.
  (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:   source/Tutorials/Advanced/ROS2-Tracing-Trace-and-Analyze.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

* ROS2-Tracing-Trace-and-Analyze fix for iron

For branch `iron`, matching `iron` branch of `tracetools_analysis` repository must be cloned.

If the `master` branch is used instead, the following `rosdep install --from-paths src --ignore-src -y` command will fail and return "test_ros2trace_analysis: Cannot locate rosdep definition for [test_tracetools]" as an error message.

Signed-off-by: Vincent Conus <124330598+sunoc@users.noreply.github.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit cb5e7dc)
Copy link

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/10527710913/artifacts/1847530979.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-4678/index.html in your favorite browser

@clalancette clalancette merged commit 7a95618 into humble Aug 23, 2024
4 checks passed
@clalancette clalancette deleted the mergify/bp/humble/pr-4675 branch August 23, 2024 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants