Skip to content

Conversation

@rockhowse
Copy link
Contributor

Description

This PR supports handling the new main branch strategy outlined below:

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
Copy link

copy-pr-bot bot commented Nov 10, 2025

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
Copy link
Contributor Author

--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)

2 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:   ci/conda-pack.sh
	modified:   ci/test_conda_nightly_env.sh

full diff

❯ git diff | cat
diff --git a/ci/conda-pack.sh b/ci/conda-pack.sh
index b17c9d2..7b7c271 100755
--- a/ci/conda-pack.sh
+++ b/ci/conda-pack.sh
@@ -3,7 +3,7 @@

 set -e

-RAPIDS_VER="25.12"
+RAPIDS_VER="26.02"
 VERSION_DESCRIPTOR="a"
 CONDA_USERNAME="rapidsai-nightly"

diff --git a/ci/test_conda_nightly_env.sh b/ci/test_conda_nightly_env.sh
index bc4a894..fbec59a 100755
--- a/ci/test_conda_nightly_env.sh
+++ b/ci/test_conda_nightly_env.sh
@@ -3,7 +3,7 @@

 set -euo pipefail

-RAPIDS_VERSION="25.12"
+RAPIDS_VERSION="26.02"
 CUDA_VERSION=${RAPIDS_CUDA_VERSION%.*}

 JSON_FILENAME="rapids_cuda${CUDA_VERSION}_py${RAPIDS_PY_VERSION}.json"

@rockhowse
Copy link
Contributor Author

--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 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

full diff

❯ git diff | cat
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 974eff4..0fe96e7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -34,7 +34,7 @@ concurrency:
 jobs:
   build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -44,7 +44,7 @@ jobs:
   upload-conda:
     needs: [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 }}
@@ -53,7 +53,7 @@ jobs:
   conda-pack:
     needs: [upload-conda]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.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 e1b862b..756cc6e 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -15,7 +15,7 @@ jobs:
       - build
       - test-conda-nightly-env
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
   checks:
     runs-on: ubuntu-latest
     steps:
@@ -26,7 +26,7 @@ jobs:
   build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
     with:
       build_type: pull-request
       script: ci/build_python.sh
@@ -34,7 +34,7 @@ jobs:
     needs: checks
     secrets: inherit
     # We use a build workflow so that we get CPU jobs and high matrix coverage
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
     with:
       build_type: pull-request
       script: "ci/test_conda_nightly_env.sh"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 6809777..e15ca7d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -22,7 +22,7 @@ jobs:
   test-conda-nightly-env:
     secrets: inherit
     # We use a build workflow so that we get CPU jobs and high matrix coverage
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
     with:
       build_type: pull-request
       script: "ci/test_conda_nightly_env.sh"
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 }}

@rockhowse rockhowse marked this pull request as ready for review November 10, 2025 20:49
@rockhowse rockhowse requested a review from a team as a code owner November 10, 2025 20:49
@rockhowse rockhowse requested a review from bdice November 10, 2025 20:49
@rockhowse rockhowse added bug Something isn't working non-breaking labels Nov 10, 2025
@rockhowse
Copy link
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 4b6f28c into rapidsai:main Nov 12, 2025
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working non-breaking

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants