refactored update-version.sh to handle new branching strategy#936
Conversation
|
@KyleFromNVIDIA , @bdice and @AyodeAwe this isn't probably ready for review but feel free to checkout some of the non It looks like a few of the files are still referencing The documentation changes are probably ok, but calling it out now since I know this could break lots of things if they aren't merged in the correct order and have the expected branching structure in place with valid references available. |
|
command ci/release/update-version.sh --run-context=main 26.02.00
Using run-context from CLI: main
Preparing development branch update 25.12.00a => 26.02.00 (targeting main branch)3 files changed git status
On branch ops-4339-update-version-sh-support-main-branching-strategy
Your branch is ahead of 'origin/ops-4339-update-version-sh-support-main-branching-strategy' by 1 commit.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .github/workflows/build.yaml
modified: .github/workflows/pr.yaml
modified: VERSIONdiff git diff | cat
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 02c100f..514d400 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
arch: "amd64"
branch: ${{ inputs.branch }}
build_type: ${{ inputs.build_type || 'branch' }}
- container_image: "rapidsai/ci-conda:25.12-latest"
+ container_image: "rapidsai/ci-conda:26.02-latest"
date: ${{ inputs.date }}
node_type: "cpu4"
script: "ci/build_docs.sh"
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index babdbca..682524e 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -48,7 +48,7 @@ jobs:
build_type: pull-request
node_type: "cpu4"
arch: "amd64"
- container_image: "rapidsai/ci-conda:25.12-latest"
+ container_image: "rapidsai/ci-conda:26.02-latest"
script: "ci/build_docs.sh"
telemetry-summarize:
# This job must use a self-hosted runner to record telemetry traces.
diff --git a/VERSION b/VERSION
index 7924af6..5c33046 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.12.00
+26.02.00 |
|
command ./ci/release/update-version.sh --run-context=release 25.12.00
Using run-context from CLI: release
Preparing release branch update 25.12.00a => 25.12.00 (targeting release/25.12 branch)8 files changed git status
On branch ops-4339-update-version-sh-support-main-branching-strategy
Your branch is ahead of 'origin/ops-4339-update-version-sh-support-main-branching-strategy' by 1 commit.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .github/workflows/build.yaml
modified: .github/workflows/pr.yaml
modified: .github/workflows/test.yaml
modified: .github/workflows/trigger-breaking-change-alert.yaml
modified: RAPIDS.cmake
modified: RAPIDS_BRANCH
modified: README.md
modified: rapids-cmake/cuda/init_architectures.cmakediff Important When we are running in
git diff | cat
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 02c100f..8af32b5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,7 +35,7 @@ jobs:
docs-build:
if: github.ref_type == 'branch'
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
with:
arch: "amd64"
branch: ${{ inputs.branch }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index babdbca..f1bde87 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -17,7 +17,7 @@ jobs:
- docs-build
- telemetry-setup
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
telemetry-setup:
runs-on: ubuntu-latest
continue-on-error: true
@@ -32,18 +32,18 @@ jobs:
checks:
secrets: inherit
needs: telemetry-setup
- uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/25.12
with:
ignored_pr_jobs: telemetry-summarize
conda-cpp-tests:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
with:
build_type: pull-request
script: ci/test_cpp.sh
docs-build:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
with:
build_type: pull-request
node_type: "cpu4"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 23c8941..a0d6642 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,7 +25,7 @@ on:
jobs:
cpp-tests:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
diff --git a/.github/workflows/trigger-breaking-change-alert.yaml b/.github/workflows/trigger-breaking-change-alert.yaml
index c471e2a..0b88554 100644
--- a/.github/workflows/trigger-breaking-change-alert.yaml
+++ b/.github/workflows/trigger-breaking-change-alert.yaml
@@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/25.12
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
diff --git a/RAPIDS.cmake b/RAPIDS.cmake
index 527c8ba..719fdff 100644
--- a/RAPIDS.cmake
+++ b/RAPIDS.cmake
@@ -23,7 +23,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 "main")
+ set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()
# Allow users to control the exact URL passed to FetchContent
diff --git a/RAPIDS_BRANCH b/RAPIDS_BRANCH
index ba2906d..26b8437 100644
--- a/RAPIDS_BRANCH
+++ b/RAPIDS_BRANCH
@@ -1 +1 @@
-main
+release/25.12
diff --git a/README.md b/README.md
index 7ea53e1..c1c9dae 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# <div align="left"><img src="https://rapids.ai/assets/images/rapids_logo.png" width="90px"/> rapids-cmake</div>
-**NOTE:** For the latest stable [README.md](https://github.com/rapidsai/rapids-cmake/blob/main/README.md) ensure you are on the `main` branch.
+**NOTE:** For the latest stable [README.md](https://github.com/rapidsai/rapids-cmake/blob/release/<VERSION_MAJOR>.<VERSION_MINOR>/README.md) ensure you are on the `release/<VERSION_MAJOR>.<VERSION_MINOR>` branch.
## Overview
@@ -19,7 +19,7 @@ Content](https://cmake.org/cmake/help/latest/module/FetchContent.html) into your
cmake_minimum_required(...)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
- file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/RAPIDS.cmake
+ file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/release/<VERSION_MAJOR>.<VERSION_MINOR>/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
endif()
include(${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
@@ -167,4 +167,4 @@ A few notes:
## Contributing
-Review the [CONTRIBUTING.md](https://github.com/rapidsai/rapids-cmake/blob/main/CONTRIBUTING.md) file for information on how to contribute code and issues to the project.
+Review the [CONTRIBUTING.md](https://github.com/rapidsai/rapids-cmake/blob/release/<VERSION_MAJOR>.<VERSION_MINOR>/CONTRIBUTING.md) file for information on how to contribute code and issues to the project.
diff --git a/rapids-cmake/cuda/init_architectures.cmake b/rapids-cmake/cuda/init_architectures.cmake
index 8577cd3..4d9f9a4 100644
--- a/rapids-cmake/cuda/init_architectures.cmake
+++ b/rapids-cmake/cuda/init_architectures.cmake
@@ -41,7 +41,7 @@ Example on how to properly use :cmake:command:`rapids_cuda_init_architectures`:
cmake_minimum_required(...)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake)
- file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/RAPIDS.cmake
+ file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/release/<VERSION_MAJOR>.<VERSION_MINOR>/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake)
endif()
include(${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake) |
|
Fixing SPDX headers: pre-commit run --all-files
[INFO] Initializing environment for https://github.com/pre-commit/mirrors-clang-format.
[INFO] Initializing environment for https://github.com/codespell-project/codespell.
[INFO] Initializing environment for https://github.com/codespell-project/codespell:tomli.
[INFO] Initializing environment for https://github.com/rapidsai/dependency-file-generator.
[INFO] Initializing environment for local:cmakelang==0.6.13.
[INFO] Initializing environment for https://github.com/rapidsai/pre-commit-hooks.
[INFO] Initializing environment for https://github.com/shellcheck-py/shellcheck-py.
[INFO] Installing environment for https://github.com/pre-commit/mirrors-clang-format.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/codespell-project/codespell.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/rapidsai/dependency-file-generator.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for local.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/rapidsai/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/shellcheck-py/shellcheck-py.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check json...............................................................Passed
pretty format json.......................................................Passed
clang-format.............................................................Passed
codespell................................................................Passed
RAPIDS dependency file generator.........................................Passed
cmake-format.............................................................Passed
- hook id: cmake-format
- duration: 18.83s
Using format file /Users/nrock/Projects/nvidia/rockhowse/rapids-cmake/cmake-format-rapids-cmake.json
cmake-lint...............................................................Passed
- hook id: cmake-lint
- duration: 0.66s
Using format file /Users/nrock/Projects/nvidia/rockhowse/rapids-cmake/cmake-format-rapids-cmake.json
verify-copyright.........................................................Failed
- hook id: verify-copyright
- exit code: 1
- files were modified by this hook
In file rapids-cmake/cuda/init_architectures.cmake:2:41:
# SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION.
warning: copyright is out of date
In file rapids-cmake/cuda/init_architectures.cmake:2:27:
-# SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION.
+# SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION.
note: suggested fix applied
verify-codeowners........................................................Passed
shellcheck...............................................................Passeddiff git diff | cat
diff --git a/rapids-cmake/cuda/init_architectures.cmake b/rapids-cmake/cuda/init_architectures.cmake
index 8577cd3..2b6d953 100644
--- a/rapids-cmake/cuda/init_architectures.cmake
+++ b/rapids-cmake/cuda/init_architectures.cmake
@@ -1,5 +1,5 @@
#=============================================================================
-# SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION.
+# SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION.
# SPDX-License-Identifier: Apache-2.0
#=============================================================================
include_guard(GLOBAL) |
ci/release/update-version.sh
Outdated
|
|
||
| # Determine RUN_CONTEXT with CLI precedence over environment variable, defaulting to main | ||
| if [[ -n "$CLI_RUN_CONTEXT" ]]; then | ||
| RUN_CONTEXT="$CLI_RUN_CONTEXT" |
There was a problem hiding this comment.
We have a mixture of $VAR and ${VAR} throughout. I weakly prefer ${VAR} everywhere.
There was a problem hiding this comment.
I weakly prefer ${VAR} everywhere.
I also weakly prefer ${VAR} when used inside of "" as it's easy to spot as a human.
ci/release/update-version.sh
Outdated
| # Update template URLs in documentation and examples based on context | ||
| if [[ "${RUN_CONTEXT}" == "main" ]]; then | ||
| # In main context, use "main" branch in URLs | ||
| sed_runner "s|release/<VERSION_MAJOR>\\.<VERSION_MINOR>|main|g" README.md |
There was a problem hiding this comment.
Some of these changes aren't right. Like
**NOTE:** For the latest stable [README.md](https://github.com/rapidsai/rapids-cmake/blob/release/<VERSION_MAJOR>.<VERSION_MINOR>/README.md) ensure you are on the `release/<VERSION_MAJOR>.<VERSION_MINOR>` branch.
That comment in the README is wrong to begin with (says that main is latest stable but it's the development branch) but we also shouldn't insert placeholders into URLs. Check over some things like that.
There was a problem hiding this comment.
we also shouldn't insert placeholders into URLs
@bdice for these types of things we are changing the original intent of the content which is fine, just calling it out as I am focusing on preserving the original as close as possible.
So in this case instead of having
release/<VERSION_MAJOR>.<VERSION_MINOR> as was originally in the README.md we have it use /main/ or /release/25.12/ so it points to the ACTUAL version of the docs.
There was a problem hiding this comment.
ok yeah I am going to read through the docs to make sure sentences like this
NOTE: For the latest stable README.md ensure you are on the main branch.
still make sense, which they do NOT since we transitioned away from stable being main good callout.
…ranch string instead of placeholders
| **NOTE:** For the latest stable [README.md](https://github.com/rapidsai/rapids-cmake/blob/main/README.md) ensure you are on the `main` branch. | ||
|
|
There was a problem hiding this comment.
Removed this note as it called out the abonormal pattern of having the stable release branch be main. Now main is the dev and each release branch has it's own set of docs that align with it so in essence this comment is no longer required.
|
|
||
| if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake) | ||
| file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-<VERSION_MAJOR>.<VERSION_MINOR>/RAPIDS.cmake | ||
| file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/RAPIDS.cmake |
There was a problem hiding this comment.
This will now be rendered with the correct release version in the release branch instead of having placeholders as was originally the case.
diff --git a/README.md b/README.md
index 477eb94..ed9a6a2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Content](https://cmake.org/cmake/help/latest/module/FetchContent.html) into your
cmake_minimum_required(...)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
- file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/RAPIDS.cmake
+ file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/release/25.12/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
endif()
include(${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
@@ -165,4 +165,4 @@ A few notes:|
command ./ci/release/update-version.sh --run-context=main 26.02.00
Using run-context from CLI: main
Preparing development branch update 25.12.00a => 26.02.00 (targeting main branch)3 files changed git status
On branch ops-4339-update-version-sh-support-main-branching-strategy
Your branch is up to date with 'origin/ops-4339-update-version-sh-support-main-branching-strategy'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .github/workflows/build.yaml
modified: .github/workflows/pr.yaml
modified: VERSIONdiff git diff | cat
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 02c100f..514d400 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
arch: "amd64"
branch: ${{ inputs.branch }}
build_type: ${{ inputs.build_type || 'branch' }}
- container_image: "rapidsai/ci-conda:25.12-latest"
+ container_image: "rapidsai/ci-conda:26.02-latest"
date: ${{ inputs.date }}
node_type: "cpu4"
script: "ci/build_docs.sh"
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index babdbca..682524e 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -48,7 +48,7 @@ jobs:
build_type: pull-request
node_type: "cpu4"
arch: "amd64"
- container_image: "rapidsai/ci-conda:25.12-latest"
+ container_image: "rapidsai/ci-conda:26.02-latest"
script: "ci/build_docs.sh"
telemetry-summarize:
# This job must use a self-hosted runner to record telemetry traces.
diff --git a/VERSION b/VERSION
index 7924af6..5c33046 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.12.00
+26.02.00 |
|
command ./ci/release/update-version.sh --run-context=release 25.12.00
Using run-context from CLI: release
Preparing release branch update 25.12.00a => 25.12.00 (targeting release/25.12 branch)8 files changed git status
On branch ops-4339-update-version-sh-support-main-branching-strategy
Your branch is up to date with 'origin/ops-4339-update-version-sh-support-main-branching-strategy'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .github/workflows/build.yaml
modified: .github/workflows/pr.yaml
modified: .github/workflows/test.yaml
modified: .github/workflows/trigger-breaking-change-alert.yaml
modified: RAPIDS.cmake
modified: RAPIDS_BRANCH
modified: README.md
modified: rapids-cmake/cuda/init_architectures.cmakediff
git diff | cat
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 02c100f..8af32b5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,7 +35,7 @@ jobs:
docs-build:
if: github.ref_type == 'branch'
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
with:
arch: "amd64"
branch: ${{ inputs.branch }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index babdbca..f1bde87 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -17,7 +17,7 @@ jobs:
- docs-build
- telemetry-setup
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
telemetry-setup:
runs-on: ubuntu-latest
continue-on-error: true
@@ -32,18 +32,18 @@ jobs:
checks:
secrets: inherit
needs: telemetry-setup
- uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/25.12
with:
ignored_pr_jobs: telemetry-summarize
conda-cpp-tests:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
with:
build_type: pull-request
script: ci/test_cpp.sh
docs-build:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
with:
build_type: pull-request
node_type: "cpu4"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 23c8941..a0d6642 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,7 +25,7 @@ on:
jobs:
cpp-tests:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
diff --git a/.github/workflows/trigger-breaking-change-alert.yaml b/.github/workflows/trigger-breaking-change-alert.yaml
index c471e2a..0b88554 100644
--- a/.github/workflows/trigger-breaking-change-alert.yaml
+++ b/.github/workflows/trigger-breaking-change-alert.yaml
@@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/25.12
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
diff --git a/RAPIDS.cmake b/RAPIDS.cmake
index 527c8ba..719fdff 100644
--- a/RAPIDS.cmake
+++ b/RAPIDS.cmake
@@ -23,7 +23,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 "main")
+ set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()
# Allow users to control the exact URL passed to FetchContent
diff --git a/RAPIDS_BRANCH b/RAPIDS_BRANCH
index ba2906d..26b8437 100644
--- a/RAPIDS_BRANCH
+++ b/RAPIDS_BRANCH
@@ -1 +1 @@
-main
+release/25.12
diff --git a/README.md b/README.md
index 477eb94..ed9a6a2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Content](https://cmake.org/cmake/help/latest/module/FetchContent.html) into your
cmake_minimum_required(...)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
- file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/RAPIDS.cmake
+ file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/release/25.12/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
endif()
include(${CMAKE_CURRENT_BINARY_DIR}/<PROJECT>_RAPIDS.cmake)
@@ -165,4 +165,4 @@ A few notes:
## Contributing
-Review the [CONTRIBUTING.md](https://github.com/rapidsai/rapids-cmake/blob/main/CONTRIBUTING.md) file for information on how to contribute code and issues to the project.
+Review the [CONTRIBUTING.md](https://github.com/rapidsai/rapids-cmake/blob/release/25.12/CONTRIBUTING.md) file for information on how to contribute code and issues to the project.
diff --git a/rapids-cmake/cuda/init_architectures.cmake b/rapids-cmake/cuda/init_architectures.cmake
index 2b6d953..f235d27 100644
--- a/rapids-cmake/cuda/init_architectures.cmake
+++ b/rapids-cmake/cuda/init_architectures.cmake
@@ -41,7 +41,7 @@ Example on how to properly use :cmake:command:`rapids_cuda_init_architectures`:
cmake_minimum_required(...)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake)
- file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/RAPIDS.cmake
+ file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/release/25.12/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake)
endif()
include(${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake) |
|
|
||
| if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake) | ||
| file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake | ||
| file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/main/RAPIDS.cmake |
There was a problem hiding this comment.
When in release context this turns into:
diff --git a/RAPIDS.cmake b/RAPIDS.cmake
index 527c8ba..719fdff 100644
--- a/RAPIDS.cmake
+++ b/RAPIDS.cmake
@@ -23,7 +23,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 "main")
+ set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()
AyodeAwe
left a comment
There was a problem hiding this comment.
LGTM but might need a second look from @robertmaynard @bdice @vyasr for the cmake parts
| 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 "main") |
There was a problem hiding this comment.
In release context this gets changed to
diff --git a/RAPIDS.cmake b/RAPIDS.cmake
index 527c8ba..719fdff 100644
--- a/RAPIDS.cmake
+++ b/RAPIDS.cmake
@@ -23,7 +23,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 "main")
+ set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()|
/merge |
Description
This PR supports handling the new main branch strategy outlined below:
RSN 47 - Changes to RAPIDS branching strategy in 25.12
The update-version.sh script should now support two methods
CLI arguments: --run-context=main|release
ENV var RAPIDS_RUN_CONTEXT=main|release
xref: rapidsai/build-planning#224
Checklist
cmake-format.jsonis up to date with these changes.include_guard(GLOBAL))