From 7bd9213ec513eead911ce3b7155866ae4ef52289 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller-moko@noreply.git.mokoconsulting.tech>
Date: Thu, 4 Jun 2026 12:33:01 -0500
Subject: [PATCH] ci: RC pre-release bumps minor version, consolidating dev
 patches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dev patches (02.33.01, 02.33.02, etc.) exist for the update system.
RC consolidates to next minor: 02.33.xx → 02.34.00-rc.
auto-release already uses --bump minor for stable.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .mokogitea/workflows/pre-release.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.mokogitea/workflows/pre-release.yml b/.mokogitea/workflows/pre-release.yml
index 390b5be0..6f9db8ba 100644
--- a/.mokogitea/workflows/pre-release.yml
+++ b/.mokogitea/workflows/pre-release.yml
@@ -103,6 +103,17 @@ jobs:
           # Strip any existing suffix from version before applying stability
           VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
 
+          # RC and stable consolidate dev patches into a clean minor bump
+          # e.g. 02.33.15 → 02.34.00 (not 02.33.15-rc)
+          case "$STABILITY" in
+            release-candidate)
+              MAJOR=$(echo "$VERSION" | cut -d. -f1)
+              MINOR=$(echo "$VERSION" | cut -d. -f2)
+              MINOR=$(printf "%02d" $((10#$MINOR + 1)))
+              VERSION="${MAJOR}.${MINOR}.00"
+              ;;
+          esac
+
           php ${MOKO_CLI}/version_set_platform.php \
             --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true