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

[CI] Increase timeout for controller_managers_srv test (backport #1224) #1225

Merged
merged 2 commits into from
Dec 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 17, 2023

This is an automatic backport of pull request #1224 done by Mergify.
Cherry-pick of 82c82ae has failed:

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

You are currently cherry-picking commit 82c82ae.
  (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:   controller_manager/CMakeLists.txt

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

(cherry picked from commit 82c82ae)

# Conflicts:
#	controller_manager/CMakeLists.txt
@bmagyar bmagyar merged commit 13cd553 into humble Dec 27, 2023
11 of 12 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1224 branch December 27, 2023 20: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.

3 participants