Skip to content

Waitable should check callback_group if it can be executed. (backport #1001) #1015

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

Merged
merged 1 commit into from
Nov 3, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2022

This is an automatic backport of pull request #1001 done by Mergify.
Cherry-pick of 7780fa1 has failed:

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

You are currently cherry-picking commit 7780fa1.
  (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:   rclpy/rclpy/executors.py

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

Signed-off-by: Tomoya Fujita <[email protected]>
(cherry picked from commit 7780fa1)
@fujitatomoya fujitatomoya force-pushed the mergify/bp/foxy/pr-1001 branch from d83c750 to a2bc26a Compare September 29, 2022 21:05
@fujitatomoya
Copy link
Collaborator

CI:

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

@fujitatomoya
Copy link
Collaborator

fujitatomoya commented Oct 12, 2022

CI:

  • Windows Build Status

@fujitatomoya
Copy link
Collaborator

https://ci.ros2.org/job/ci_windows/18026/ are unrelated to this fix, i will go ahead to merge this.

@fujitatomoya fujitatomoya merged commit 4e1654e into foxy Nov 3, 2022
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/foxy/pr-1001 branch November 3, 2022 16:51
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