refactored update-version.sh to handle new branching strategy #20

rockhowse · 2025-11-12T16:38:14Z

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 supports two modes controlled via CLI params or ENV vars:

CLI arguments: --run-context=main|release
ENV var RAPIDS_RUN_CONTEXT=main|release

xref: rapidsai/build-planning#224

copy-pr-bot · 2025-11-12T16:38:17Z

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

rockhowse · 2025-11-12T16:40:50Z

--run-context=main with version 26.02.00

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)

10 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:   .devcontainer/cuda12.9-conda/devcontainer.json
	modified:   .devcontainer/cuda12.9-pip/devcontainer.json
	modified:   .devcontainer/cuda13.0-conda/devcontainer.json
	modified:   .devcontainer/cuda13.0-pip/devcontainer.json
	modified:   VERSION
	modified:   conda/environments/all_cuda-129_arch-aarch64.yaml
	modified:   conda/environments/all_cuda-129_arch-x86_64.yaml
	modified:   conda/environments/all_cuda-130_arch-aarch64.yaml
	modified:   conda/environments/all_cuda-130_arch-x86_64.yaml
	modified:   dependencies.yaml

full diff

❯ git diff | cat
diff --git a/.devcontainer/cuda12.9-conda/devcontainer.json b/.devcontainer/cuda12.9-conda/devcontainer.json
index ab6a345..67defac 100644
--- a/.devcontainer/cuda12.9-conda/devcontainer.json
+++ b/.devcontainer/cuda12.9-conda/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "12.9",
       "PYTHON_PACKAGE_MANAGER": "conda",
-      "BASE": "rapidsai/devcontainers:25.12-cpp-mambaforge"
+      "BASE": "rapidsai/devcontainers:26.02-cpp-mambaforge"
     }
   },
   "runArgs": [
@@ -17,7 +17,7 @@
   ],
   "hostRequirements": {"gpu": "optional"},
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
   },
   "overrideFeatureInstallOrder": [
     "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
diff --git a/.devcontainer/cuda12.9-pip/devcontainer.json b/.devcontainer/cuda12.9-pip/devcontainer.json
index 5e77d94..f5f103d 100644
--- a/.devcontainer/cuda12.9-pip/devcontainer.json
+++ b/.devcontainer/cuda12.9-pip/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "12.9",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:25.12-cpp-cuda12.9"
+      "BASE": "rapidsai/devcontainers:26.02-cpp-cuda12.9"
     }
   },
   "runArgs": [
@@ -17,14 +17,14 @@
   ],
   "hostRequirements": {"gpu": "optional"},
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/cuda:25.12": {
+    "ghcr.io/rapidsai/devcontainers/features/cuda:26.2": {
       "version": "12.9",
       "installcuBLAS": true,
       "installcuSOLVER": true,
       "installcuRAND": true,
       "installcuSPARSE": true
     },
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
   },
   "overrideFeatureInstallOrder": [
     "ghcr.io/rapidsai/devcontainers/features/cuda",
diff --git a/.devcontainer/cuda13.0-conda/devcontainer.json b/.devcontainer/cuda13.0-conda/devcontainer.json
index 9b289fd..9fdff70 100644
--- a/.devcontainer/cuda13.0-conda/devcontainer.json
+++ b/.devcontainer/cuda13.0-conda/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "13.0",
       "PYTHON_PACKAGE_MANAGER": "conda",
-      "BASE": "rapidsai/devcontainers:25.12-cpp-mambaforge"
+      "BASE": "rapidsai/devcontainers:26.02-cpp-mambaforge"
     }
   },
   "runArgs": [
@@ -17,7 +17,7 @@
   ],
   "hostRequirements": {"gpu": "optional"},
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
   },
   "overrideFeatureInstallOrder": [
     "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
diff --git a/.devcontainer/cuda13.0-pip/devcontainer.json b/.devcontainer/cuda13.0-pip/devcontainer.json
index d1a4bf6..e141d3a 100644
--- a/.devcontainer/cuda13.0-pip/devcontainer.json
+++ b/.devcontainer/cuda13.0-pip/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "13.0",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:25.12-cpp-cuda13.0"
+      "BASE": "rapidsai/devcontainers:26.02-cpp-cuda13.0"
     }
   },
   "runArgs": [
@@ -17,14 +17,14 @@
   ],
   "hostRequirements": {"gpu": "optional"},
   "features": {
-    "ghcr.io/rapidsai/devcontainers/features/cuda:25.12": {
+    "ghcr.io/rapidsai/devcontainers/features/cuda:26.2": {
       "version": "13.0",
       "installcuBLAS": true,
       "installcuSOLVER": true,
       "installcuRAND": true,
       "installcuSPARSE": true
     },
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
   },
   "overrideFeatureInstallOrder": [
     "ghcr.io/rapidsai/devcontainers/features/cuda",
diff --git a/VERSION b/VERSION
index 7924af6..5c33046 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.12.00
+26.02.00
diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml
index 0c74ed5..cebe017 100644
--- a/conda/environments/all_cuda-129_arch-aarch64.yaml
+++ b/conda/environments/all_cuda-129_arch-aarch64.yaml
@@ -19,8 +19,8 @@ dependencies:
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
-- libraft-headers==25.12.*
-- librmm==25.12.*
+- libraft-headers==26.2.*
+- librmm==26.2.*
 - ninja
 - pre-commit
 - python>=3.10,<3.14
diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml
index f471108..6d2b04a 100644
--- a/conda/environments/all_cuda-129_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-129_arch-x86_64.yaml
@@ -19,8 +19,8 @@ dependencies:
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
-- libraft-headers==25.12.*
-- librmm==25.12.*
+- libraft-headers==26.2.*
+- librmm==26.2.*
 - ninja
 - pre-commit
 - python>=3.10,<3.14
diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml
index 109ba97..0a909d2 100644
--- a/conda/environments/all_cuda-130_arch-aarch64.yaml
+++ b/conda/environments/all_cuda-130_arch-aarch64.yaml
@@ -19,8 +19,8 @@ dependencies:
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
-- libraft-headers==25.12.*
-- librmm==25.12.*
+- libraft-headers==26.2.*
+- librmm==26.2.*
 - ninja
 - pre-commit
 - python>=3.10,<3.14
diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml
index e379b88..04709bf 100644
--- a/conda/environments/all_cuda-130_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-130_arch-x86_64.yaml
@@ -19,8 +19,8 @@ dependencies:
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
-- libraft-headers==25.12.*
-- librmm==25.12.*
+- libraft-headers==26.2.*
+- librmm==26.2.*
 - ninja
 - pre-commit
 - python>=3.10,<3.14
diff --git a/dependencies.yaml b/dependencies.yaml
index ea1af9a..42eb8b4 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -35,8 +35,8 @@ dependencies:
           - c-compiler
           - cuda-nvcc
           - cxx-compiler
-          - libraft-headers==25.12.*
-          - librmm==25.12.*
+          - libraft-headers==26.2.*
+          - librmm==26.2.*
     specific:
       - output_types: conda
         matrices:

rockhowse · 2025-11-12T16:42:00Z

--run-context=release with version 25.12.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)

4 files updated

❯ 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/trigger-breaking-change-alert.yaml
	modified:   RAPIDS_BRANCH

full diff:

❯ git diff | cat
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aed7f00..86568d8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -34,7 +34,7 @@ concurrency:
 jobs:
   cpp-build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -45,7 +45,7 @@ jobs:
     if: ${{ !startsWith(github.ref, 'refs/tags/') }}
     needs: [cpp-build]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/25.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -55,7 +55,7 @@ jobs:
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
     needs: [cpp-build]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/25.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e1a07a7..7655471 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -14,7 +14,7 @@ jobs:
       - devcontainer
       - 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
@@ -29,20 +29,20 @@ 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-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
     with:
       build_type: pull-request
       script: ci/build_cpp.sh
   devcontainer:
     secrets: inherit
     needs: telemetry-setup
-    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/25.12
     with:
       arch: '["amd64", "arm64"]'
       cuda: '["13.0"]'
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_BRANCH b/RAPIDS_BRANCH
index ba2906d..26b8437 100644
--- a/RAPIDS_BRANCH
+++ b/RAPIDS_BRANCH
@@ -1 +1 @@
-main
+release/25.12

gforsyth

rockhowse · 2025-11-13T15:37:43Z

/merge

rockhowse · 2025-11-13T16:45:52Z

/merge

rockhowse added 2 commits November 8, 2025 08:38

refactored update-version.sh to handle new branching strategy

c8b64a5

added directory location check to update-version.sh

a3fbad9

rockhowse added bug Something isn't working non-breaking Introduces a non-breaking change labels Nov 12, 2025

rockhowse changed the title ~~Ops 4339 update version sh support main branching strategy~~ refactored update-version.sh to handle new branching strategy Nov 12, 2025

rockhowse marked this pull request as ready for review November 12, 2025 21:37

rockhowse requested review from a team as code owners November 12, 2025 21:37

rockhowse requested a review from gforsyth November 12, 2025 21:37

gforsyth approved these changes Nov 13, 2025

View reviewed changes

AyodeAwe approved these changes Nov 13, 2025

View reviewed changes

bdice approved these changes Nov 13, 2025

View reviewed changes

rapids-bot bot merged commit ab76bf9 into rapidsai:main Nov 13, 2025
18 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactored update-version.sh to handle new branching strategy #20

refactored update-version.sh to handle new branching strategy #20

Uh oh!

rockhowse commented Nov 12, 2025

Uh oh!

copy-pr-bot bot commented Nov 12, 2025

Uh oh!

rockhowse commented Nov 12, 2025

Uh oh!

rockhowse commented Nov 12, 2025

Uh oh!

gforsyth left a comment

Uh oh!

rockhowse commented Nov 13, 2025

Uh oh!

rockhowse commented Nov 13, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

refactored update-version.sh to handle new branching strategy #20

refactored update-version.sh to handle new branching strategy #20

Uh oh!

Conversation

rockhowse commented Nov 12, 2025

Description

Uh oh!

copy-pr-bot bot commented Nov 12, 2025

Uh oh!

rockhowse commented Nov 12, 2025

Uh oh!

rockhowse commented Nov 12, 2025

Uh oh!

gforsyth left a comment

Choose a reason for hiding this comment

Uh oh!

rockhowse commented Nov 13, 2025

Uh oh!

rockhowse commented Nov 13, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants