Skip to content

Bump CMake version to 3.19.6. #36094

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

Merged
merged 1 commit into from
Jul 24, 2021
Merged

Conversation

zoecarver
Copy link
Contributor

@zoecarver zoecarver commented Feb 22, 2021

Updates the required CMake version for Swift and the Swift Benchmarks to 3.18 3.19.6. Updates the docs to reflect this change. Doesn't modify the required version for building the stdlib.

Required for #36082.

@zoecarver
Copy link
Contributor Author

@shahmishal This patch would require some of the Linux build bots to be updated.

@gottesmm
Copy link
Contributor

Can you do a post on the forum about this to check for objections?

@finagolfin
Copy link
Member

I think you'll need to update the CMake built from source too, see #30695 for an example.

@zoecarver
Copy link
Contributor Author

@buttaface will do.


Here's the forum post.

@finagolfin
Copy link
Member

Anything holding this back? There is a Foundation patch that I'd like to upstream that needs a CMake bump first, as the last BUILD_RPATH line from my patch doesn't work with the currently used year-old CMake.

@zoecarver
Copy link
Contributor Author

There's nothing on my side holding this back. I think @gottesmm was waiting on something, though. I also might just try to get uswift to use spm to unblock #36082.

@zoecarver
Copy link
Contributor Author

@gottesmm any updates or should I try to get swiftpm working?

@zoecarver
Copy link
Contributor Author

@swift-ci please test.

@zoecarver
Copy link
Contributor Author

@swift-ci please test.

1 similar comment
@zoecarver
Copy link
Contributor Author

@swift-ci please test.

@zoecarver zoecarver changed the title Bump CMake version to 3.18. Bump CMake version to 3.17. Apr 29, 2021
@gottesmm
Copy link
Contributor

@zoecarver can you add to the commit message that you are updating the cmake tag for 3.19 in update-checkout?

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - debd1727db610acf33d595c4a771e9e86ccd9250

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - debd1727db610acf33d595c4a771e9e86ccd9250

@artemcm
Copy link
Contributor

artemcm commented Apr 29, 2021

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - debd1727db610acf33d595c4a771e9e86ccd9250

@zoecarver
Copy link
Contributor Author

@gottesmm done.

@swift-ci please smoke test.

@@ -187,7 +187,7 @@ Double-check that running `pwd` prints a path ending with `swift`.

### Spot check dependencies

* Run `cmake --version`: This should be 3.18.1 or higher for macOS.
* Run `cmake --version`: This should be 3.17 or higher.
Copy link
Member

Choose a reason for hiding this comment

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

I'd like to point out something here. Based on my reading of the CMake docs and usage over the years, the real de facto minimum after this pull will be 3.19.1, as that's what the CI will be enforcing. In that case, that's what should be listed as the minimum here in the docs.

@compnerd, can you confirm?

Copy link
Contributor

Choose a reason for hiding this comment

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

One thing to be aware of is that the cmake issue you are talking about would only apply on Linux where the build behavior occurs. Windows/macOS on CI will just use what is on the system.

Copy link
Member

Choose a reason for hiding this comment

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

Sure, the de facto minimum is the minimum CMake version used on the CI, ie min(mac CI version, linux CI version, Win CI version). Raising this for the Linux CI will simply change one input to that equation.

@zoecarver
Copy link
Contributor Author

Looks like there was a version mismatch issue. Maybe a clean build will get the bots green.

@swift-ci please clean test.

@swift-ci
Copy link
Contributor

swift-ci commented May 4, 2021

Build failed
Swift Test Linux Platform
Git Sha - 520667aa2a2540e6197a6603c2e67f9a9f8d7dea

@finagolfin
Copy link
Member

Looks like this is moving forward in #37517, maybe this pull can just add the doc changes after that's in.

@zoecarver
Copy link
Contributor Author

@gottesmm do you want me to update this to 3.19? It looks like the other PR only updated the checkouts script.

@gottesmm
Copy link
Contributor

@zoecarver not time yet. Waiting for one other thing.

@gottesmm
Copy link
Contributor

and I am going to want to update to 3.19.6

Updates the CMake version for Swift and the Swift Benchmarks to 3.19.6.
Updates the docs to reflect this change. Does not modify the required version for building the stdlib.
@zoecarver zoecarver changed the title Bump CMake version to 3.17. Bump CMake version to 3.19.6. Jul 12, 2021
@zoecarver
Copy link
Contributor Author

@swift-ci please clean test.

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - a13c57c

@zoecarver
Copy link
Contributor Author

@swift-ci please clean test macOS.

@zoecarver
Copy link
Contributor Author

@swift-ci please test macOS.

@zoecarver
Copy link
Contributor Author

@swift-ci please test Windows.

1 similar comment
@zoecarver
Copy link
Contributor Author

@swift-ci please test Windows.

@zoecarver
Copy link
Contributor Author

Source kit issues :/

@swift-ci please test Windows.

@zoecarver
Copy link
Contributor Author

@swift-ci please test Windows.

@gottesmm
Copy link
Contributor

FYI: Even when this is green, please don't merge until Sat or Sun. There is a bunch of commits trying to get into main right now and we don't want to churn the tree with something unless we need to.

@zoecarver
Copy link
Contributor Author

The windows bots keep failing for unrelated issues. This shows that there isn't a problem with the CMake version, though, because those tests wouldn't even be able to run if there was. I'll give this one more try because it would be nice if it was green, but otherwise I'll just land it tomorrow.

@swift-ci please test Windows.

@gottesmm gottesmm merged commit f432bd9 into swiftlang:main Jul 24, 2021
@compnerd
Copy link
Member

CC: @drodriguez - this seems to have regressed the VS2017 builders :-(.

@drodriguez
Copy link
Contributor

CC: @drodriguez - this seems to have regressed the VS2017 builders :-(.

Hopefully the next build will use CMake 3.21. Thanks for the heads up!

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.

8 participants