From 2b475c4e3c4985a45c0fb2bd757500d7a6dc6945 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller-moko@noreply.git.mokoconsulting.tech>
Date: Sat, 16 May 2026 09:05:39 -0500
Subject: [PATCH] chore(ci): version bump targets dev branch instead of main
 [skip ci]

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .mokogitea/workflows/auto-release.yml | 37 ++++++++++++++++-----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/.mokogitea/workflows/auto-release.yml b/.mokogitea/workflows/auto-release.yml
index 84fc7012..dbaf151d 100644
--- a/.mokogitea/workflows/auto-release.yml
+++ b/.mokogitea/workflows/auto-release.yml
@@ -79,14 +79,16 @@ jobs:
       - name: Detect platform
         id: platform
         run: |
-          # Read platform from XML manifest (<platform> tag) or plain text fallback
-          PLATFORM=$(sed -n 's/.*<platform>\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1)
-          [ -z "$PLATFORM" ] && PLATFORM=$(cat .mokogitea/manifest.xml 2>/dev/null | tr -d '[:space:]')
+          # Parse .manifest.xml via manifest_read.php — outputs all fields to GITHUB_OUTPUT
+          php /tmp/mokostandards-api/cli/manifest_read.php --path . --github-output 2>/dev/null || true
+          PLATFORM=$(php /tmp/mokostandards-api/cli/manifest_read.php --path . --field platform 2>/dev/null)
           [ -z "$PLATFORM" ] && PLATFORM="generic"
           echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT"
           echo "Platform detected: ${PLATFORM}"
+          # entry-point from manifest, find as fallback
+          MOD_FILE=$(php /tmp/mokostandards-api/cli/manifest_read.php --path . --field entry-point 2>/dev/null)
+          [ -z "$MOD_FILE" ] && MOD_FILE=$(find . -maxdepth 4 -name "mod*.class.php" ! -path "./.git/*" -exec grep -l 'extends DolibarrModules' {} \; 2>/dev/null | head -1)
           MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '<extension' {} \; 2>/dev/null | head -1)
-          MOD_FILE=$(find . -maxdepth 4 -name "mod*.class.php" ! -path "./.git/*" -exec grep -l 'extends DolibarrModules' {} \; 2>/dev/null | head -1)
           echo "manifest=${MANIFEST}" >> "$GITHUB_OUTPUT"
           echo "mod_file=${MOD_FILE}" >> "$GITHUB_OUTPUT"
 
@@ -185,7 +187,7 @@ jobs:
           git add -A
           git diff --cached --quiet || {
             git commit -m "chore(version): bump ${CURRENT} → ${VERSION} [skip ci]"
-            git push origin HEAD:main 2>&1
+            git push origin HEAD:dev 2>&1 || git push origin HEAD:main 2>&1
           }
 
           # Override version output for rest of pipeline
@@ -939,25 +941,30 @@ jobs:
           done
           echo "Cleaned up ${DELETED} pre-release channel(s)" >> $GITHUB_STEP_SUMMARY
 
-      # -- STEP 11: Reset dev branch from main ------------------------------------
-      - name: "Step 11: Delete and recreate dev branch from main"
+      # -- STEP 11: Sync dev branch with main + version bump ----------------------
+      - name: "Step 11: Merge main into dev (version bump lands on dev)"
         if: steps.version.outputs.skip != 'true'
         continue-on-error: true
         run: |
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           TOKEN="${{ secrets.GA_TOKEN }}"
 
-          # Delete dev branch
-          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
-            "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch"
-
-          # Recreate dev from main (now includes version bump + changelog promotion)
+          # Merge main into dev so dev has the release + version bump
           curl -sf -X POST -H "Authorization: token ${TOKEN}" \
             -H "Content-Type: application/json" \
-            "${API_BASE}/branches" \
-            -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Recreated dev from main"
+            "${API_BASE}/merges" \
+            -d "{\"base\":\"dev\",\"head\":\"main\",\"message\":\"chore: sync main into dev after release [skip ci]\"}" \
+            2>/dev/null && echo "Merged main into dev"
 
-          echo "Dev branch reset from main (keeps dev ahead after release)" >> $GITHUB_STEP_SUMMARY
+          # If dev doesn't exist, create it from main
+          if [ $? -ne 0 ]; then
+            curl -sf -X POST -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/json" \
+              "${API_BASE}/branches" \
+              -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Created dev from main"
+          fi
+
+          echo "Dev branch synced with main (version bump on dev)" >> $GITHUB_STEP_SUMMARY
 
 
       # -- Dolibarr post-release: Reset dev version -----------------------------