search

fictionlab / ros_aruco_opencv

ROS wrapper for ArUco Opencv module
MIT License
16 stars 16 forks source link

Add ament_lint tests to cmakelists instead of github workflows (backport #7) #8

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

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

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

You are currently cherry-picking commit f5fdf40.
  (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:   aruco_opencv/CMakeLists.txt
    modified:   aruco_opencv/include/aruco_opencv/parameters.hpp
    modified:   aruco_opencv/include/aruco_opencv/utils.hpp
    modified:   aruco_opencv/package.xml
    modified:   aruco_opencv/src/single_marker_tracker.cpp
    modified:   aruco_opencv/src/utils.cpp
    modified:   aruco_opencv_msgs/CMakeLists.txt
    modified:   aruco_opencv_msgs/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/ci-humble.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