From 2a034161dbbc66769db3fb7b587eaf08cb4dfabc Mon Sep 17 00:00:00 2001
From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech>
Date: Tue, 26 May 2026 22:49:45 +0000
Subject: [PATCH] chore(ci): update auto-bump.yml from moko-platform [skip ci]

---
 .mokogitea/workflows/auto-bump.yml | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/.mokogitea/workflows/auto-bump.yml b/.mokogitea/workflows/auto-bump.yml
index d1dedf1..10a7e51 100644
--- a/.mokogitea/workflows/auto-bump.yml
+++ b/.mokogitea/workflows/auto-bump.yml
@@ -8,7 +8,7 @@
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /.mokogitea/workflows/auto-bump.yml
 # VERSION: 09.02.00
-# BRIEF: Auto patch-bump version on every push to dev
+# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
 
 name: "Universal: Auto Version Bump"
 
@@ -16,9 +16,9 @@ on:
   push:
     branches:
       - dev
-      - main
 
 env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
   GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
 
 permissions:
@@ -26,11 +26,12 @@ permissions:
 
 jobs:
   bump:
-    name: Patch Bump
+    name: Version Bump
     runs-on: release
     if: >-
       !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip bump]')
+      !contains(github.event.head_commit.message, '[skip bump]') &&
+      !startsWith(github.event.head_commit.message, 'Merge pull request')
 
     steps:
       - name: Checkout
@@ -56,18 +57,7 @@ jobs:
 
       - name: Bump version
         run: |
-          BRANCH="${{ github.ref_name }}"
-
-          # main = minor bump, dev = patch bump
-          if [ "$BRANCH" = "main" ]; then
-            BUMP_TYPE="--minor"
-            BUMP_LABEL="minor"
-          else
-            BUMP_TYPE=""
-            BUMP_LABEL="patch"
-          fi
-
-          BUMP=$(php ${MOKO_CLI}/version_bump.php --path . $BUMP_TYPE 2>&1) || true
+          BUMP=$(php ${MOKO_CLI}/version_bump.php --path . 2>&1) || true
           echo "$BUMP"
 
           VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null) || true
@@ -75,7 +65,7 @@ jobs:
 
           # Propagate to platform manifests
           php ${MOKO_CLI}/version_set_platform.php \
-            --path . --version "$VERSION" --branch "$BRANCH" 2>/dev/null || true
+            --path . --version "$VERSION" --branch dev 2>/dev/null || true
           php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
 
           # Commit if anything changed
@@ -88,7 +78,7 @@ jobs:
           git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://jmiller:${{ secrets.GA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
           git add -A
-          git commit -m "chore(version): ${BUMP_LABEL} bump to ${VERSION} [skip ci]" \
+          git commit -m "chore(version): patch bump to ${VERSION} [skip ci]" \
             --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>"
-          git push origin "$BRANCH"
-          echo "Bumped to ${VERSION} (${BUMP_LABEL})" >> $GITHUB_STEP_SUMMARY
+          git push origin dev
+          echo "Bumped to ${VERSION}" >> $GITHUB_STEP_SUMMARY