Skip to content

Update build infra to support new branching strategy #1143

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

Merged
rapids-bot merged 7 commits into from
Jul 28, 2025
Merged

Update build infra to support new branching strategy #1143

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b915319
rapids_config will use `RAPIDS_BRANCH` contents to determine what bra…
robertmaynard Jul 21, 2025
aabfe48
rapids_config will use `RAPIDS_BRANCH` contents to determine what bra…
robertmaynard Jul 21, 2025
ca302b6
Correct style issues found by CI
robertmaynard Jul 21, 2025
0298764
Merge branch 'branch-25.10' into rapids_config_a_suffix_support
robertmaynard Jul 23, 2025
c820580
Merge branch 'branch-25.10' into rapids_config_a_suffix_support
robertmaynard Jul 25, 2025
e95739b
add RAPIDS_BRANCH file for rust bindings
robertmaynard Jul 25, 2025
b4c82a9
Make RAPIDS_BRANCH a symlink
robertmaynard Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RAPIDS_BRANCH
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
branch-25.10
6 changes: 3 additions & 3 deletions cmake/RAPIDS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)

# Allow users to control which version is used
if(NOT rapids-cmake-version OR NOT rapids-cmake-version MATCHES [[^([0-9][0-9])\.([0-9][0-9])$]])
if(NOT rapids-cmake-branch OR NOT rapids-cmake-version)
message(
FATAL_ERROR "The CMake variable rapids-cmake-version must be defined in the format MAJOR.MINOR."
FATAL_ERROR "The CMake variable `rapids-cmake-branch` or `rapids-cmake-version` must be defined"
)
endif()

Expand All @@ -33,7 +33,7 @@ endif()
# Allow users to control which branch is fetched
if(NOT rapids-cmake-branch)
# Define a default branch if the user doesn't set one
set(rapids-cmake-branch "branch-${rapids-cmake-version}")
set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()

# Allow users to control the exact URL passed to FetchContent
Expand Down
10 changes: 10 additions & 0 deletions cmake/rapids_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,15 @@ else()
)
endif()

# Use STRINGS to trim whitespace/newlines
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH" _rapids_branch)
if(NOT _rapids_branch)
message(
FATAL_ERROR
"Could not determine branch name to use for checking out rapids-cmake. The file \"${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH\" is missing."
)
endif()

set(rapids-cmake-version "${RAPIDS_VERSION_MAJOR_MINOR}")
set(rapids-cmake-branch "${_rapids_branch}")
include("${CMAKE_CURRENT_LIST_DIR}/RAPIDS.cmake")
Loading