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

Upgrade to Google test 1.14.0 #84

Merged
merged 2 commits into from
Feb 6, 2024

Conversation

clalancette
Copy link
Contributor

@clalancette clalancette commented Jan 18, 2024

This matches the version that will be in Ubuntu 24.04, and should resolve some CMake warnings when building on that platform.

@marcoag please take a look at this and ament/googletest#27 when you get a chance.

@marcoag
Copy link
Member

marcoag commented Jan 19, 2024

I did a local build with no issues, LGTM.

Note: I can't review or mark the approval since I'm not assigned.

@clalancette
Copy link
Contributor Author

CI:

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

@marcoag marcoag self-assigned this Jan 31, 2024
clalancette and others added 2 commits February 2, 2024 15:47
Since we now have C++17 everywhere, we can remove the mpark::variant
fallback.

Signed-off-by: Chris Lalancette <[email protected]>
Signed-off-by: Chris Lalancette <[email protected]>
@clalancette clalancette force-pushed the clalancette/update-gtest-to-1.14 branch from 0a2f54f to ca1f57d Compare February 2, 2024 15:50
@clalancette
Copy link
Contributor Author

OK, I think I figured out the difference here. I think some of the code was trying to use std::variant, and some was trying to use mpark::variant. In the latest, I removed the mpark::variant; we don't need it anymore since we have C++17 everywhere. So I think this should fix the issue, I'll run another CI on it.

@wjwwood @marcoag I could use another review here.

@clalancette
Copy link
Contributor Author

CI:

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

@clalancette
Copy link
Contributor Author

I'm going to go ahead and merge this one since it was already approved. If there are any followups I'll deal with them separately.

@clalancette clalancette merged commit 1a9b928 into rolling Feb 6, 2024
1 check passed
@clalancette clalancette deleted the clalancette/update-gtest-to-1.14 branch February 6, 2024 14:15
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.

2 participants