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

Add embeddedRTPS as experimental middleware (backport #29) #30

Merged
merged 2 commits into from
Oct 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2021

This is an automatic backport of pull request #29 done by Mergify.
Cherry-pick of c4d02ba has failed:

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

You are currently cherry-picking commit c4d02ba.
  (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:   .gitignore
	new file:   .images/cube.png
	new file:   .images/microros_logo.png
	new file:   embeddedrtps.md
	new file:   microros_static_library_ide/library_generation/colcon-embeddedrtps.meta
	modified:   microros_static_library_ide/library_generation/colcon.meta
	modified:   microros_static_library_ide/library_generation/extract_flags.py
	modified:   microros_static_library_ide/library_generation/library_generation.sh
	new file:   sample_main_embeddedrtps.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

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.io/

* Initial

* Update

* Update

* Update

* Update

* Fix image

* Fix link

* Update

* Update

* Update

* Update

* Add rtps conf to .meta

* Apply suggestions from code review

Co-authored-by: Antonio Cuadros <[email protected]>

Co-authored-by: Antonio Cuadros <[email protected]>
Co-authored-by: Antonio Cuadros <[email protected]>
(cherry picked from commit c4d02ba)

# Conflicts:
#	README.md
@pablogs9 pablogs9 merged commit ac009ef into main Oct 18, 2021
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-29 branch October 18, 2021 05:56
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.

1 participant