Skip to content

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

Merged
rapids-bot[bot] merged 3 commits intorapidsai:mainfrom
rockhowse:ops-4339-update-version-sh-support-main-branching-strategy
Nov 13, 2025
Merged

refactored update-version.sh to handle new branching strategy#323
rapids-bot[bot] merged 3 commits intorapidsai:mainfrom
rockhowse:ops-4339-update-version-sh-support-main-branching-strategy

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

@rockhowse
Copy link
Contributor Author

--run-context=main for 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 for 26.02.00 (targeting main branch)
Updating to 26.02.00

1 file changes

❯ 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:   VERSION

full diff

❯ git diff | cat
diff --git a/VERSION b/VERSION
index 7924af6..5c33046 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.12.00
+26.02.00

@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 for 25.12.00 (targeting release/25.12 branch)
Updating to 25.12.00

0 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'.

nothing to commit, working tree clean

full diff

❯ git diff | cat

@rockhowse rockhowse marked this pull request as ready for review November 13, 2025 20:27
@rockhowse rockhowse requested a review from a team as a code owner November 13, 2025 20:27
@rockhowse rockhowse requested review from msarahan and removed request for a team November 13, 2025 20:27
@rockhowse rockhowse added bug Something isn't working non-breaking Introduces a non-breaking change labels Nov 13, 2025
@rockhowse
Copy link
Contributor Author

Not looking optimistic on that OpenSSL bump... anything that takes over 15 min here will most likely timeout at the 45 min mark.

@gforsyth
Copy link
Contributor

Not looking optimistic on that OpenSSL bump... anything that takes over 15 min here will most likely timeout at the 45 min mark.

Ugh, why couldn't it timeout on the initial PR...

@gforsyth
Copy link
Contributor

PR reverting the openssl pin removal: #324

@rockhowse
Copy link
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 18f82f6 into rapidsai:main Nov 13, 2025
520 of 524 checks passed
@gforsyth gforsyth mentioned this pull request Nov 14, 2025
@jameslamb jameslamb mentioned this pull request Jan 15, 2026
rapids-bot bot pushed a commit that referenced this pull request Jan 16, 2026
I just merged #347 into `release/26.02` and after a few minutes hadn't seen it forward-merged to `main`.

Looks like automatic forward mergers are not set up here. They should be, now that we're producing RAPIDS-versioned images (rapidsai/build-planning#187) and using the new RAPIDS branching strategy (#323).

This enables forward mergers.

This also `git cherry-pick`s over the changes from #347 so they'll make it onto `main`.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Nate Rock (https://github.com/rockhowse)

URL: #350
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 Introduces a non-breaking change

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants