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.

Sign up for GitHub

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

Jump to bottom

Update Google Benchmark v1.5.0 to get CMake < 3.6 fix #19535

Merged
merged 3 commits into from
Sep 3, 2019
Merged

Update Google Benchmark v1.5.0 to get CMake < 3.6 fix #19535

merged 3 commits into from
Sep 3, 2019

Conversation

chwarr
Copy link
Contributor

@chwarr chwarr commented Jul 2, 2019

Google Benchmark v1.4.1 uses a CMake feature that is only in version >=
3.6. This was an inadvertent change in Google Benchmark (too high of a
version) that has been fixed upstream in v1.5.0.

Google Benchmark v1.5.0 now requires CMake >= 3.5.1. Another PR
will bump gRPC's minimum version as well.

This PR supersedes #19466.

This was referenced Jul 2, 2019
Closed
Merged
@jtattermusch jtattermusch self-assigned this Jul 3, 2019
@jtattermusch jtattermusch self-requested a review July 3, 2019 13:10
@jtattermusch jtattermusch added kokoro:run release notes: yes Indicates if PR needs to be in release notes labels Jul 3, 2019
@chwarr
Copy link
Contributor Author

chwarr commented Aug 5, 2019

I just rebased atop master as of commit 73a3ff8.

@AspirinSJL
Copy link
Member

This PR is including many other PR's unexpectedly?

@chwarr
Copy link
Contributor Author

chwarr commented Aug 5, 2019

@AspirinSJL: not sure what happened. I just rebased again atop a914d1c and the GitHub display looks cleaner now.

@chwarr
Update Google Benchmark v1.5.0 to get CMake < 3.6 fix
09c55da 
Google Benchmark v1.4.1 uses a CMake feature that is only in version >=
3.6. This was an inadvertent change in Google Benchmark (too high of a
version) that has been [fixed upstream][1] in v1.5.0.

Google Benchmark v1.5.0 now requires CMake >= 3.5.1. [Another PR][2]
will bump gRPC's minimum version as well.

[1]: google/benchmark@505be96
[2]: grpc#19467
@chwarr
Copy link
Contributor Author

chwarr commented Aug 20, 2019

Rebased atop 073b234.
Is there anything else blocking this from getting reviewed and merged?

@AspirinSJL
Copy link
Member

@jtattermusch Could you please take a look at this PR? It's >1 month old. Thanks!

@jtattermusch
Copy link
Contributor

Sorry for the delay. I think this PR is slightly problematic because cmake 3.5.1 is not available on all of our testing images (hence the failures) and the images will need to be updated first which requires some work (which I haven't gotten to yet).

Updating a submodule also requires updating a few more extra file (we have sanity checks in place), but updating those is relatively easy.

@linux-foundation-easycla
Copy link

CLA Check
The committers are authorized under a signed CLA.

@jtattermusch
Copy link
Contributor

I made the other changes required for bumping the version. Let's see what the test say (I expect we'll still need to upgrade cmake in some of our testing images)

@chwarr
Copy link
Contributor Author

chwarr commented Aug 29, 2019

Thanks for fixing the other files. We picked CMake 3.5.1 as that's what's in Debian stable and Ubuntu
16.04 and 18.04. And, we picked benchmark 1.5.0 because it only needs >= CMake 3.5.1.

@jtattermusch
Copy link
Contributor

adhoc artifact / packages build: https://sponge.corp.google.com/invocation?id=ff0f1920-5ec4-435d-a4f7-1c10bfb7848c&searchFor=

jtattermusch
jtattermusch approved these changes Sep 2, 2019
View reviewed changes
Copy link
Contributor

@jtattermusch jtattermusch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but I will still run some adhoc tests.

@jtattermusch
Copy link
Contributor

Known failures:
#20095
#19170
#20075

@nicolasnoble nicolasnoble merged commit aa203db into grpc:master Sep 3, 2019
gnossen
gnossen reviewed Sep 3, 2019
View reviewed changes
Copy link
Contributor

@gnossen gnossen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Retroactive LGTM

@chwarr chwarr deleted the benchmark-rebased branch September 9, 2019 21:52
@chwarr chwarr mentioned this pull request Oct 8, 2019
Closed
@lock lock bot locked as resolved and limited conversation to collaborators Dec 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gnossen gnossen gnossen left review comments

@jtattermusch jtattermusch jtattermusch approved these changes

@nicolasnoble nicolasnoble Awaiting requested review from nicolasnoble

@veblush veblush Awaiting requested review from veblush veblush is a code owner

Assignees

@jtattermusch jtattermusch

Labels
lang/c++ release notes: yes Indicates if PR needs to be in release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@chwarr @AspirinSJL @jtattermusch @gnossen @nicolasnoble @grpc-kokoro