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 ament_lint tests to cmakelists instead of github workflows (backport #7) #9

Merged
merged 3 commits into from Feb 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2023

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

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

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-foxy.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.

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

* Add ament_lint tests to cmakelists instead of github workflows

* Add xmllint

* Fix cpplint errors

(cherry picked from commit f5fdf40)

# Conflicts:
#	.github/workflows/ci-foxy.yml
@bjsowa bjsowa merged commit 1e9d60d into foxy Feb 21, 2023
@bjsowa bjsowa deleted the mergify/bp/foxy/pr-7 branch February 21, 2023 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant