Skip to content

Revert CMake version patch, Add CMake policy version flag to build task to support modern CMake builds #2645

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

Conversation

owenhalpert
Copy link
Contributor

@owenhalpert owenhalpert commented Apr 2, 2025

Description

To address the CMake versioning issue first seen in https://github.com/opensearch-project/k-NN/actions/runs/14176773405/job/39713460988?pr=2615, we created a patch in #2635. This patch caused problems with the beta1-build, so this is a new way to get CMake to override the minimum version required instead of modifying the source files. This will hopefully fix the beta1 build error (which was because the patch was not compatible) while keeping our KNN CI's intact.

Documentation: https://cmake.org/cmake/help/latest/variable/CMAKE_POLICY_VERSION_MINIMUM.html

Related Issues

NA

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@owenhalpert owenhalpert changed the title Change ubuntu version Change ubuntu version and revert cmake version patch Apr 2, 2025
@owenhalpert owenhalpert force-pushed the ubuntu-runner-change branch 2 times, most recently from 091c5bf to 133e27f Compare April 2, 2025 19:04
@owenhalpert owenhalpert changed the title Change ubuntu version and revert cmake version patch Add CMake policy version flag to build task to support modern CMake builds Apr 2, 2025
@owenhalpert owenhalpert force-pushed the ubuntu-runner-change branch 2 times, most recently from 1e25b94 to 4c96824 Compare April 2, 2025 19:10
@@ -18,7 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Infrastructure
### Documentation
### Maintenance
* Update minimum required CMAKE version in NMSLIB [#2635](https://github.com/opensearch-project/k-NN/pull/2635)
Copy link
Member

Choose a reason for hiding this comment

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

Probably keep the original changelog since you technically just revert the change not remove from tree.

Signed-off-by: owenhalpert <[email protected]>
@owenhalpert owenhalpert force-pushed the ubuntu-runner-change branch from 4c96824 to a8b9df3 Compare April 2, 2025 19:19
@owenhalpert owenhalpert marked this pull request as ready for review April 2, 2025 19:59
@owenhalpert owenhalpert changed the title Add CMake policy version flag to build task to support modern CMake builds Revert CMake version patch, Add CMake policy version flag to build task to support modern CMake builds Apr 2, 2025
@peterzhuamazon peterzhuamazon merged commit 1a9e721 into opensearch-project:main Apr 2, 2025
49 checks passed
@owenhalpert owenhalpert deleted the ubuntu-runner-change branch April 3, 2025 04:11
oaganesh pushed a commit to oaganesh/k-NN that referenced this pull request Apr 24, 2025
oaganesh added a commit to oaganesh/k-NN that referenced this pull request Apr 29, 2025
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.

3 participants