keep binary hotfix in 1 digit for patch digit

Author: weitingsun

.github/scripts/bump-ota-version-constants.sh

@@ -3,7 +3,8 @@
 #
 # With a semver second argument (OTA hotfix release workflow): sets OTA_VERSION to v<semver>
 # exactly as provided (e.g. 7.73.01 -> v7.73.01, 7.73.21 -> v7.73.21). No normalization is applied.
-# OTA hotfix: multi-digit patch whose last digit (patch % 10) is the OTA iteration.
+# Runway uses 2-digit patches: last digit (patch % 10) is the OTA iteration;
+# remaining digits (patch / 10) are the base binary patch.
 #
 # Without semver (local / legacy): increments in place — vX.XX.X -> v0, vN -> v(N+1), vA.B.C -> vA.B.(C+1)
 set -euo pipefail

.github/scripts/run-update-release-changelog-mobile.sh

@@ -1,24 +1,24 @@
 #!/usr/bin/env bash
 # Invokes MetaMask github-tools update-release-changelog.sh with OTA version handling.
 #
-# OTA hotfix detection: a multi-digit patch whose last digit is non-zero (e.g. release/7.77.01, release/7.77.11).
-# auto-changelog rejects leading-zero patches as invalid SemVer.
+# Runway always creates 2-digit patches. This wrapper handles two cases:
 #
-# This wrapper converts the Runway OTA version to a valid SemVer prerelease
-# for the changelog tool:
-#   Runway 7.77.01  → SemVer 7.77.0-ota.1
-#   Runway 7.77.21  → SemVer 7.77.2-ota.1
-#   Runway 7.77.111 → SemVer 7.77.11-ota.1
+# 1) OTA hotfix: multi-digit patch whose last digit is non-zero (e.g. 01, 21, 111).
+#    auto-changelog rejects these as invalid SemVer (leading zeros forbidden).
+#    Converts to a valid SemVer prerelease for the changelog tool:
+#      Runway 7.77.01  → SemVer 7.77.0-ota.1
+#      Runway 7.77.21  → SemVer 7.77.2-ota.1
+#      Runway 7.77.111 → SemVer 7.77.11-ota.1
+#    Mapping: patch % 10 = OTA iteration, patch / 10 = base binary patch.
+#
+# 2) Binary hotfix / regular release: multi-digit patch ending in 0 (e.g. 00, 10, 20).
+#    Normalized by dividing by 10: 00→0, 10→1, 20→2.
 #
 # The SemVer prerelease format stays in CHANGELOG.md permanently. auto-changelog
 # validates ALL version headers on every run, so non-SemVer versions like 7.77.01
 # would break all future changelog generation (not just OTA runs).
 #
 # The Runway version (7.77.01) is used only in branch names, OTA_VERSION, and PR titles.
-#
-# Mapping: patch % 10 = OTA iteration, patch / 10 = base binary patch.
-#   X.Y.{patch} → X.Y.{patch/10}-ota.{patch%10}
-# Multi-digit patches with last digit 0 (e.g. 10, 20) are binary hotfixes, not OTA.
 # Single-digit patches pass through unchanged.
 set -euo pipefail
 
@@ -75,8 +75,12 @@ if [[ ${#PATCH} -ge 2 && $((10#$PATCH % 10)) -ne 0 ]]; then
   fi
 else
   # Regular release or binary hotfix.
-  # Normalize leading zeros in patch for strict SemVer (e.g. 00 → 0).
-  NORMALIZED_PATCH=$((10#$PATCH))
+  # Runway 2-digit patches: normalize by dividing by 10 (e.g. 00→0, 10→1, 20→2).
+  if [[ ${#PATCH} -ge 2 ]]; then
+    NORMALIZED_PATCH=$(( 10#$PATCH / 10 ))
+  else
+    NORMALIZED_PATCH=$((10#$PATCH))
+  fi
   if [[ "$PATCH" != "$NORMALIZED_PATCH" ]]; then
     NORMALIZED_VERSION="${RUNWAY_VERSION%.*}.${NORMALIZED_PATCH}"
     echo "Normalizing patch for strict SemVer: Runway ${RUNWAY_VERSION} → ${NORMALIZED_VERSION}"

.github/workflows/auto-create-release-pr.yml

@@ -1,12 +1,12 @@
 name: Auto Create Release PR
 
 # When Runway creates release/X.Y.Z, this workflow calls create-release-pr.yml.
-# Semver convention for mobile hotfixes:
-# - X.Y.0 or X.Y.00 — regular release (no OTA_VERSION bump; 00 is normalized to 0 for strict SemVer)
-# - X.Y.Z with a single-digit patch (e.g. 7.71.1, 7.71.2) — binary hotfix (no OTA_VERSION bump)
-# - X.Y.Z where Z is multi-digit and Z % 10 == 0 (e.g. 7.73.10, 7.73.20) — binary hotfix (no OTA_VERSION bump)
-# - X.Y.Z where Z is multi-digit and Z % 10 != 0 (e.g. 7.73.01, 7.73.21, 7.73.111) — OTA hotfix;
-#   OTA_VERSION is vX.Y.Z. Last digit = OTA iteration, remaining digits = base binary patch.
+#
+# Runway always creates 2-digit patches. Convention:
+# - X.Y.00 — regular release; store version normalized to X.Y.0.
+# - X.Y.Z0 (last digit 0, e.g. 10, 20) — binary hotfix; store version X.Y.(Z0/10) e.g. 7.79.10 → 7.79.1.
+# - X.Y.ZN (last digit non-zero, e.g. 01, 21, 111) — OTA hotfix; OTA_VERSION is vX.Y.ZN.
+#   Last digit = OTA iteration, remaining digits = base binary patch.
 #   CHANGELOG.md uses the SemVer prerelease format (e.g. 7.73.0-ota.1) permanently
 #   because auto-changelog validates all version headers as strict SemVer.
 

.github/workflows/create-release-pr.yml

@@ -48,28 +48,40 @@ jobs:
           fi
 
           patch="${SEMVER##*.}"
-          normalized_patch=$((10#$patch))
-          normalized_semver="${SEMVER%.*}.${normalized_patch}"
           is_ota=false
 
-          # OTA hotfix: multi-digit patch whose last digit is non-zero.
-          # patch % 10 != 0 → OTA hotfix (last digit = OTA iteration, remaining digits = base binary patch).
-          # patch % 10 == 0 → binary hotfix (e.g. 10, 20) or regular release (0, 00).
-          # Single-digit patches (1-9) are always binary hotfixes; 0 is a regular release.
-          if [[ ${#patch} -ge 2 && $((10#$patch % 10)) -ne 0 ]]; then
-            is_ota=true
-            echo "is_ota=true" >> "$GITHUB_OUTPUT"
-            echo "OTA hotfix (patch: ${patch}, last digit: $((10#$patch % 10))): branch release/${SEMVER}; OTA_VERSION v${SEMVER}."
+          # Runway always creates 2-digit patches. Convention:
+          #   patch % 10 != 0 → OTA hotfix (last digit = OTA iteration, remaining = base binary patch).
+          #   patch % 10 == 0 → binary hotfix or regular release; normalized by dividing by 10.
+          #   Single-digit patches (1-9) are binary hotfixes; 0 is a regular release.
+          #
+          # Normalization (non-OTA, multi-digit): patch / 10 → store version.
+          #   00 → 0 (regular release), 10 → 1, 20 → 2, etc.
+          if [[ ${#patch} -ge 2 ]]; then
+            numeric_patch=$((10#$patch))
+            if [[ $((numeric_patch % 10)) -ne 0 ]]; then
+              is_ota=true
+              normalized_patch=$numeric_patch
+              echo "is_ota=true" >> "$GITHUB_OUTPUT"
+              echo "OTA hotfix (patch: ${patch}, last digit: $((numeric_patch % 10))): branch release/${SEMVER}; OTA_VERSION v${SEMVER}."
+            else
+              normalized_patch=$((numeric_patch / 10))
+              echo "is_ota=false" >> "$GITHUB_OUTPUT"
+              echo "Binary hotfix or release (patch: ${patch} → normalized ${normalized_patch})."
+            fi
           else
+            normalized_patch=$((10#$patch))
             echo "is_ota=false" >> "$GITHUB_OUTPUT"
-            echo "Not OTA hotfix (patch segment: ${patch})."
+            echo "Single-digit patch (${patch}): binary hotfix or release."
           fi
 
-          # Detect if patch has leading zeros requiring local version bump
-          # (e.g. 00 → normalized 0). The github-tools action rejects leading-zero patches.
+          normalized_semver="${SEMVER%.*}.${normalized_patch}"
+
+          # Detect if the Runway patch differs from the normalized store version,
+          # requiring a local version bump (github-tools rejects non-standard patches).
           if [[ "$patch" != "$normalized_patch" && "$is_ota" != "true" ]]; then
             echo "needs_local_bump=true" >> "$GITHUB_OUTPUT"
-            echo "Patch has leading zeros (${patch} → ${normalized_patch}): will bump versions locally."
+            echo "Runway patch ${patch} → store patch ${normalized_patch}: will bump versions locally."
           else
             echo "needs_local_bump=false" >> "$GITHUB_OUTPUT"
           fi
@@ -135,8 +147,9 @@ jobs:
           github-token: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
           google-application-creds-base64: ${{ github.event_name == 'workflow_dispatch' && secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 || secrets.google-application-creds-base64 }}
 
-      # --- Local version-bump path for Runway patches with leading zeros (e.g. 7.79.00) ---
-      # The github-tools action rejects leading-zero patches as invalid strict SemVer.
+      # --- Local version-bump path for Runway patches that differ from store version ---
+      # Runway 2-digit patches (e.g. 7.79.00 → 0, 7.79.10 → 1) need normalization.
+      # The github-tools action rejects these as invalid strict SemVer.
       # We check out the Runway branch directly and bump versions with the normalized semver.
       - name: Check for existing release PR (local bump)
         id: local_bump_pr