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_auto_add_gmock to ament_cmake_auto (backport #482) #493

Merged
merged 1 commit into from Nov 30, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 16, 2023

This is an automatic backport of pull request #482 done by Mergify.


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

* Adding ament_auto_add_gmock to ament_cmake_auto

Similar rationale of ament_auto_add_gtest, but for gmock.

ament_auto_add_gmock is a convinient macro that groups ament_add_gmock,
target_include_directories, target_link_libraries and
ament_target_dependencies in a single call for gmock tests.

* Added missing find_package for ament auto gtest and gmock

This saves us from having to test_depend ament_cmake_gtest or
ament_cmake_gmock directly in the target's package.xml

Signed-off-by: Jordan Palacios <jordan.palacios@pal-robotics.com>
(cherry picked from commit 261214a)
@sloretz
Copy link
Contributor

sloretz commented Nov 16, 2023

CI (humble repos build: --packages-up-to rcutils test: --packages-select ament_cmake_auto)

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@sloretz sloretz self-assigned this Nov 16, 2023
@jordan-palacios
Copy link
Contributor

Odd, seems like the DCO check is failing, even though the Signed-off-by it's there (as per the original commit). @sloretz any ideas?

@christophebedard
Copy link
Contributor

christophebedard commented Nov 20, 2023

See here: https://github.com/ament/ament_cmake/pull/493/checks?check_run_id=18762976765

It's expecting an @gmail.com address as per the commit author email address, but the sign-off email is different. I think GitHub for some reason changes the commit author email to your GitHub email when merging. This can be manually approved, though.

@clalancette
Copy link
Contributor

This can be manually approved, though.

Yeah, I've manually set it, since the commit does have a DCO. I've also kicked off new CI, since it was run with incorrect arguments:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@jordan-palacios
Copy link
Contributor

jordan-palacios commented Nov 24, 2023

@clalancette Thanks for the fix! Since everything seems in order can we accept the PR?

@clalancette clalancette merged commit 3a586d1 into humble Nov 30, 2023
3 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-482 branch November 30, 2023 18:48
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.

None yet

4 participants