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.

Sign up for GitHub

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

Jump to bottom

Implement rcl_clock_time_started (backport #1021) #1078

Merged
merged 1 commit into from
Jun 13, 2023
Merged

Implement rcl_clock_time_started (backport #1021) #1078

merged 1 commit into from
Jun 13, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 12, 2023

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

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@methylDragon @mergify
Implement rcl_clock_time_started (#1021)
d6f66e1 
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 09d86e2)
@mergify mergify bot mentioned this pull request Jun 12, 2023
Merged
@methylDragon
Copy link
Contributor

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

@emersonknapp
Copy link
Collaborator

emersonknapp commented Jun 12, 2023 •
edited
Loading

16:46:39 === .\src\ros2\rcl (git) ===
16:46:39 Auto-merging rcl/CHANGELOG.rst
16:46:39 CONFLICT (content): Merge conflict in rcl/CHANGELOG.rst
16:46:39 Auto-merging rcl/package.xml
16:46:39 CONFLICT (content): Merge conflict in rcl/package.xml
16:46:39 Auto-merging rcl/src/rcl/logging.c
16:46:39 Auto-merging rcl/src/rcl/logging_rosout.c
16:46:39 CONFLICT (content): Merge conflict in rcl/src/rcl/logging_rosout.c
16:46:39 Auto-merging rcl/test/rcl/test_time.cpp
16:46:39 CONFLICT (content): Merge conflict in rcl/test/rcl/test_time.cpp
16:46:39 Auto-merging rcl_action/CHANGELOG.rst
16:46:39 CONFLICT (content): Merge conflict in rcl_action/CHANGELOG.rst
16:46:39 Auto-merging rcl_action/package.xml
16:46:39 CONFLICT (content): Merge conflict in rcl_action/package.xml
16:46:39 Auto-merging rcl_lifecycle/CHANGELOG.rst
16:46:39 CONFLICT (content): Merge conflict in rcl_lifecycle/CHANGELOG.rst
16:46:39 Auto-merging rcl_lifecycle/package.xml
16:46:39 CONFLICT (content): Merge conflict in rcl_lifecycle/package.xml
16:46:39 Auto-merging rcl_yaml_param_parser/CHANGELOG.rst
16:46:39 CONFLICT (content): Merge conflict in rcl_yaml_param_parser/CHANGELOG.rst
16:46:39 Auto-merging rcl_yaml_param_parser/package.xml
16:46:39 CONFLICT (content): Merge conflict in rcl_yaml_param_parser/package.xml
16:46:39 Automatic merge failed; fix conflicts and then commit the result.

Not sure what that means, this PR doesn't change those files - but it's the same across platforms so it's not a flake. Hpr works OK.

@emersonknapp emersonknapp mentioned this pull request Jun 12, 2023
Merged
@methylDragon
Copy link
Contributor

methylDragon commented Jun 13, 2023 •
edited
Loading

Hmm, I might have mistyped the branch names

Edit: ah no, I need a repos file

fujitatomoya
fujitatomoya approved these changes Jun 13, 2023
View reviewed changes
Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

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

lgtm with green CI

@fujitatomoya
Copy link
Collaborator

CI:

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

@emersonknapp emersonknapp mentioned this pull request Jun 13, 2023
Merged
@methylDragon methylDragon merged commit e1f19be into humble Jun 13, 2023
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1021 branch June 13, 2023 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fujitatomoya fujitatomoya fujitatomoya approved these changes

@emersonknapp emersonknapp emersonknapp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@methylDragon @emersonknapp @fujitatomoya