micro-ROS / micro_ros_setup

Support macros for building micro-ROS-based firmware.
Apache License 2.0
336 stars 128 forks source link

Fix rolling (backport #687) #689

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 4 months ago

This is an automatic backport of pull request #687 done by Mergify. Cherry-pick of 944843d5aa146465bf29c3b25c7ca108b417907c has failed:

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

You are currently cherry-picking commit 944843d.
  (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:   package.xml
    modified:   scripts/create_firmware_ws.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/ci.yml
    both modified:   .github/workflows/nightly.yml
    both modified:   config/host/generic/client_host_packages.repos
    both modified:   scripts/create_ws.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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
mergify[bot] commented 4 months ago

Cherry-pick of 944843d5aa146465bf29c3b25c7ca108b417907c has failed:

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

You are currently cherry-picking commit 944843d.
  (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:   package.xml
    modified:   scripts/create_firmware_ws.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/ci.yml
    both modified:   .github/workflows/nightly.yml
    both modified:   config/host/generic/client_host_packages.repos
    both modified:   scripts/create_ws.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally