Skip to content

Added missing chrono includes (backport #2854)#2857

Merged
ahcorde merged 2 commits intohumblefrom
mergify/bp/humble/pr-2854
May 26, 2025
Merged

Added missing chrono includes (backport #2854)#2857
ahcorde merged 2 commits intohumblefrom
mergify/bp/humble/pr-2854

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 22, 2025

Related with this issue #2853


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

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
(cherry picked from commit 373a63c)

# Conflicts:
#	rclcpp/test/rclcpp/executors/test_events_queue.cpp
#	rclcpp/test/rclcpp/executors/test_waitable.cpp
#	rclcpp/test/rclcpp/test_logger_service.cpp
#	rclcpp/test/rclcpp/test_service_introspection.cpp
#	rclcpp_lifecycle/test/test_service.cpp
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 22, 2025

Cherry-pick of 373a63c has failed:

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

You are currently cherry-picking commit 373a63c.
  (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:   rclcpp/test/benchmark/benchmark_executor.cpp
	modified:   rclcpp/test/rclcpp/test_generic_pubsub.cpp
	modified:   rclcpp/test/rclcpp/test_parameter_service.cpp
	modified:   rclcpp/test/rclcpp/test_service.cpp
	modified:   rclcpp/test/rclcpp/test_wait_for_message.cpp
	modified:   rclcpp_action/test/test_client.cpp
	modified:   rclcpp_components/test/test_component_manager_api.cpp
	modified:   rclcpp_lifecycle/test/benchmark/benchmark_lifecycle_client.cpp
	modified:   rclcpp_lifecycle/test/test_lifecycle_node.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   rclcpp/test/rclcpp/executors/test_events_queue.cpp
	deleted by us:   rclcpp/test/rclcpp/executors/test_waitable.cpp
	deleted by us:   rclcpp/test/rclcpp/test_logger_service.cpp
	deleted by us:   rclcpp/test/rclcpp/test_service_introspection.cpp
	deleted by us:   rclcpp_lifecycle/test/test_service.cpp

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 May 22, 2025
@mergify mergify bot mentioned this pull request May 22, 2025
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Copy Markdown
Contributor

ahcorde commented May 23, 2025

Pulls: #2857
Gist: https://gist.githubusercontent.com/ahcorde/f3b9012c3446ceb1d2c33a199a4dad75/raw/c3df7cbc90b7db682c80a669952c269b0d79aa62/ros2.repos
BUILD args: --packages-above-and-dependencies rclcpp
TEST args: --packages-above rclcpp
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/16076

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde ahcorde merged commit f43d4ed into humble May 26, 2025
2 of 3 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-2854 branch May 26, 2025 11:29
@ahcorde
Copy link
Copy Markdown
Contributor

ahcorde commented May 26, 2025

Pulls: #2857
Gist: https://gist.githubusercontent.com/ahcorde/5808794f1879896caf9940b7945e4ab0/raw/c3df7cbc90b7db682c80a669952c269b0d79aa62/ros2.repos
BUILD args: --packages-above-and-dependencies rclcpp
TEST args: --packages-above rclcpp
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/16079

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

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