From b5c19e1b892154e48740da4baa3d43b44f4edb73 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Tue, 2 Dec 2025 13:18:13 +0100
Subject: [PATCH] ci: Fix rc versioning to properly bump major version (#22603)

---
 .github/scripts/bump-versions.mjs       | 21 +++------------------
 .github/workflows/release-create-pr.yml |  2 +-
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.github/scripts/bump-versions.mjs b/.github/scripts/bump-versions.mjs
index 214fe806d3b..dbcebe77b29 100644
--- a/.github/scripts/bump-versions.mjs
+++ b/.github/scripts/bump-versions.mjs
@@ -22,24 +22,9 @@ function generateExperimentalVersion(currentVersion) {
 	return `${parsed.major}.${parsed.minor}.${parsed.patch}-exp.0`;
 }
 
-function generateRcVersion(currentVersion) {
-	const parsed = semver.parse(currentVersion);
-	if (!parsed) throw new Error(`Invalid version: ${currentVersion}`);
-
-	// Check if it's already an RC version
-	if (parsed.prerelease.length > 0 && parsed.prerelease[0] === 'rc') {
-		// Increment the RC number
-		const rcNum = (parsed.prerelease[1] || 0) + 1;
-		return `${parsed.major}.${parsed.minor}.${parsed.patch}-rc.${rcNum}`;
-	}
-
-	// Create new RC version: <major>.<minor>.<patch>-rc.0
-	return `${parsed.major}.${parsed.minor}.${parsed.patch}-rc.0`;
-}
-
 const rootDir = process.cwd();
 const releaseType = process.env.RELEASE_TYPE;
-assert.match(releaseType, /^(patch|minor|major|experimental|rc)$/, 'Invalid RELEASE_TYPE');
+assert.match(releaseType, /^(patch|minor|major|experimental|premajor)$/, 'Invalid RELEASE_TYPE');
 
 // TODO: if releaseType is `auto` determine release type based on the changelog
 
@@ -78,8 +63,8 @@ for (const packageName in packageMap) {
 		)
 			? releaseType === 'experimental'
 				? generateExperimentalVersion(version)
-				: releaseType === 'rc'
-					? generateRcVersion(version)
+				: releaseType === 'premajor'
+				? semver.inc(version, version.includes('-rc.') ? 'prerelease' : 'premajor', undefined, 'rc')
 					: semver.inc(version, releaseType)
 			: version;
 
diff --git a/.github/workflows/release-create-pr.yml b/.github/workflows/release-create-pr.yml
index cce7da5ed78..2d35efb5dac 100644
--- a/.github/workflows/release-create-pr.yml
+++ b/.github/workflows/release-create-pr.yml
@@ -18,7 +18,7 @@ on:
           - minor
           - major
           - experimental
-          - rc
+          - premajor
 
 jobs:
   create-release-pr: