Skip to content

Implement rcl_clock_time_started (backport #1021)#1078

Merged
methylDragon merged 1 commit intohumblefrom
mergify/bp/humble/pr-1021
Jun 13, 2023
Merged

Implement rcl_clock_time_started (backport #1021)#1078
methylDragon merged 1 commit intohumblefrom
mergify/bp/humble/pr-1021

Conversation

@mergify
Copy link
Copy Markdown

@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 @fujitatomoya @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
Copy Markdown
Contributor

methylDragon commented Jun 12, 2023

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

@emersonknapp
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Collaborator

fujitatomoya commented Jun 13, 2023

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

@emersonknapp emersonknapp emersonknapp approved these changes

@fujitatomoya fujitatomoya fujitatomoya 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