search

micro-ROS / micro_ros_zephyr_module

micro-ROS Zephyr module and sample code
Apache License 2.0
46 stars 22 forks source link

Move support to v2.7.x and v3.1.0 (backport #64) #66

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

This is an automatic backport of pull request #64 done by Mergify. Cherry-pick of 07797dfc4edab2f160c41a7b47acfd1b7b8b26f2 has failed:

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

You are currently cherry-picking commit 07797df.
  (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:   .github/workflows/ci.yml
    modified:   README.md
    modified:   modules/libmicroros/microros_transports/serial-usb/microros_transports.c
    modified:   modules/libmicroros/microros_transports/serial-usb/microros_transports.h
    modified:   prj.conf
    modified:   src/main.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/nightly.yml

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](https://docs.mergify.com/). 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 ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com