modify workflow to accept 2 digits

Author: weitingsun

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

@@ -3,7 +3,7 @@
 #
 # 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.
-# Two-digit patch AB means OTA hotfix: base patch A, iteration B.
+# OTA hotfix: multi-digit patch whose last digit (patch % 10) is the OTA iteration.
 #
 # 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,21 +1,24 @@
 #!/usr/bin/env bash
 # Invokes MetaMask github-tools update-release-changelog.sh with OTA version handling.
 #
-# OTA hotfix detection: a two-digit patch in the branch version (e.g. release/7.77.01).
-# auto-changelog rejects these as invalid SemVer (leading zeros are forbidden).
+# 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.
 #
 # 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
 #
 # 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 (two-digit patch AB):  X.Y.AB → X.Y.A-ota.B
+# 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
 
@@ -40,10 +43,10 @@ fi
 
 PATCH="${RUNWAY_VERSION##*.}"
 
-if [[ ${#PATCH} -eq 2 ]]; then
-  # OTA hotfix: two-digit patch AB → X.Y.A-ota.B
-  BASE_PATCH="${PATCH:0:1}"
-  OTA_NUM="${PATCH:1:1}"
+if [[ ${#PATCH} -ge 2 && $((10#$PATCH % 10)) -ne 0 ]]; then
+  # OTA hotfix: last digit = OTA iteration, remaining digits = base binary patch
+  BASE_PATCH=$((10#$PATCH / 10))
+  OTA_NUM=$((10#$PATCH % 10))
   SEMVER_VERSION="${RUNWAY_VERSION%.*}.${BASE_PATCH}-ota.${OTA_NUM}"
 
   echo "OTA hotfix detected: Runway ${RUNWAY_VERSION} → SemVer ${SEMVER_VERSION}"

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

@@ -3,9 +3,10 @@ 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 — regular release (no OTA_VERSION bump)
-# - X.Y.Z with a single-digit patch (e.g. 7.71.1, 7.71.2) — regular hotfix (no OTA_VERSION bump)
-# - X.Y.AB with a two-digit patch (e.g. 7.73.01, 7.73.21) — OTA hotfix; OTA_VERSION is v7.73.01.
-#   Two-digit patch AB → base patch A, OTA iteration B.
+# - 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.
 #   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

@@ -46,12 +46,13 @@ jobs:
           fi
 
           patch="${SEMVER##*.}"
-          # OTA hotfix: patch has exactly two digits (e.g. 01, 21, 22).
-          # Two-digit patch AB → base patch A, OTA iteration B.
-          # Single-digit patches are regular hotfixes; single-digit 0 is a regular release.
-          if [[ ${#patch} -eq 2 ]]; then
+          # 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).
+          # Single-digit patches (1-9) are always binary hotfixes; 0 is a regular release.
+          if [[ ${#patch} -ge 2 && $((10#$patch % 10)) -ne 0 ]]; then
             echo "is_ota=true" >> "$GITHUB_OUTPUT"
-            echo "OTA hotfix (two-digit patch: ${patch}): branch release/${SEMVER}; OTA_VERSION v${SEMVER}."
+            echo "OTA hotfix (patch: ${patch}, last digit: $((10#$patch % 10))): branch release/${SEMVER}; OTA_VERSION v${SEMVER}."
           else
             echo "is_ota=false" >> "$GITHUB_OUTPUT"
             echo "Not OTA hotfix (patch segment: ${patch})."
@@ -165,7 +166,7 @@ jobs:
             git push origin "$BRANCH"
           fi
 
-      # Changelog: run-update-release-changelog-mobile.sh converts OTA two-digit patches to valid SemVer prereleases. The SemVer format stays in CHANGELOG.md permanently.
+      # Changelog: run-update-release-changelog-mobile.sh converts OTA patches to valid SemVer prereleases. The SemVer format stays in CHANGELOG.md permanently.
       - name: Checkout github-tools (release changelog)
         if: needs.resolve-bases.outputs.is_ota == 'true' && steps.ota_release_pr.outputs.exists != 'true'
         uses: actions/checkout@v4
@@ -210,7 +211,7 @@ jobs:
           set -euo pipefail
           BRANCH="release/${SEMVER}"
           PATCH="${SEMVER##*.}"
-          SEMVER_CL="${SEMVER%.*}.${PATCH:0:1}-ota.${PATCH:1:1}"
+          SEMVER_CL="${SEMVER%.*}.$((10#$PATCH / 10))-ota.$((10#$PATCH % 10))"
           BODY="OTA hotfix: branch \`${BRANCH}\`."
           BODY="${BODY}"$'\n\n'"- Native semver and build version are **not** bumped."
           BODY="${BODY}"$'\n'"- \`OTA_VERSION\` in \`app/constants/ota.ts\` is \`v${SEMVER}\`."