Merge pull request 'fix(ci): new version bump protocol � release as-is, bump dev after' (#34) from dev into main

.gitea/workflows/auto-release.yml

@@ -134,54 +134,15 @@ jobs:
             echo "Version: $VERSION (patch — platform version + badges only)"
           fi
 
-      # -- STEP 1b: Bump minor version (stable = minor bump, reset patch) ------
-      - name: "Step 1b: Bump minor version for stable release"
+      # -- STEP 1b: Promote CHANGELOG [Unreleased] to current version -----------
+      - name: "Step 1b: Promote CHANGELOG for release"
         if: steps.version.outputs.skip != 'true'
         id: bump
         run: |
-          CURRENT=$(sed -n 's/.*VERSION:[[:space:]]*\([0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\).*/\1/p' README.md 2>/dev/null | head -1)
-          [ -z "$CURRENT" ] && { echo "skip=true" >> "$GITHUB_OUTPUT"; exit 0; }
-
-          MAJOR=$((10#$(echo "$CURRENT" | cut -d. -f1)))
-          MINOR=$((10#$(echo "$CURRENT" | cut -d. -f2)))
-
-          # Minor bump, reset patch. Rollover if minor > 99
-          MINOR=$((MINOR + 1))
-          if [ $MINOR -gt 99 ]; then
-            MINOR=0
-            MAJOR=$((MAJOR + 1))
-          fi
-
-          VERSION=$(printf "%02d.%02d.00" $MAJOR $MINOR)
+          VERSION="${{ steps.version.outputs.version }}"
           TODAY=$(date +%Y-%m-%d)
 
-          echo "Stable bump: ${CURRENT} → ${VERSION} (minor)"
-
-          # Update README.md
-          sed -i "s/VERSION:[[:space:]]*${CURRENT}/VERSION: ${VERSION}/" README.md
-
-          # Update platform-specific manifest
-          PLATFORM="${{ steps.platform.outputs.platform }}"
-          MANIFEST="${{ steps.platform.outputs.manifest }}"
-          MOD_FILE="${{ steps.platform.outputs.mod_file }}"
-          case "$PLATFORM" in
-            joomla)
-              if [ -n "$MANIFEST" ]; then
-                MANIFEST_VER=$(sed -n 's/.*<version>\([^<]*\)<\/version>.*/\1/p' "$MANIFEST" | head -1)
-                [ -n "$MANIFEST_VER" ] && sed -i "s|<version>${MANIFEST_VER}</version>|<version>${VERSION}</version>|" "$MANIFEST"
-                sed -i "s|<creationDate>[^<]*</creationDate>|<creationDate>${TODAY}</creationDate>|" "$MANIFEST"
-              fi
-              ;;
-            dolibarr)
-              if [ -n "$MOD_FILE" ]; then
-                sed -i "s/\$this->version = '[^']*'/\$this->version = '${VERSION}'/" "$MOD_FILE"
-              fi
-              echo "${VERSION}" > update.txt
-              ;;
-            *) ;;
-          esac
-
-          # Promote [Unreleased] section in CHANGELOG.md to new version
+          # Promote [Unreleased] section in CHANGELOG.md to release version
           if [ -f "CHANGELOG.md" ] && grep -qi "Unreleased" CHANGELOG.md; then
             sed -i "s|## \[Unreleased\]|## [${VERSION}] --- ${TODAY}|" CHANGELOG.md
             sed -i "s|## Unreleased|## [${VERSION}] --- ${TODAY}|" CHANGELOG.md
@@ -190,19 +151,19 @@ jobs:
             echo "CHANGELOG promoted to [${VERSION}]"
           fi
 
-          # Commit and push
+          # Commit changelog promotion if changed
           git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
           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 diff --cached --quiet || {
-            git commit -m "chore(version): bump ${CURRENT} → ${VERSION} [skip ci]"
+            git commit -m "chore(release): promote CHANGELOG ${VERSION} [skip ci]"
             git push origin HEAD:main 2>&1
           }
 
-          # Override version output for rest of pipeline
+          # Pass through version (no bump — release uses version as-is from dev)
           echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
-          echo "major=$(printf "%02d" $MAJOR)" >> "$GITHUB_OUTPUT"
+          echo "major=${{ steps.version.outputs.major }}" >> "$GITHUB_OUTPUT"
 
       - name: Check if already released
         if: steps.version.outputs.skip != 'true'
@@ -962,25 +923,74 @@ 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: Reset dev branch and bump to next minor -------------------------
+      - name: "Step 11: Reset dev and bump to next minor"
         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 }}"
+          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          PLATFORM="${{ steps.platform.outputs.platform }}"
 
           # 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)
+          # Recreate dev from main
           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"
 
-          echo "Dev branch reset from main (keeps dev ahead after release)" >> $GITHUB_STEP_SUMMARY
+          # Calculate next minor version for dev
+          MAJOR=$((10#$(echo "$VERSION" | cut -d. -f1)))
+          MINOR=$((10#$(echo "$VERSION" | cut -d. -f2)))
+          MINOR=$((MINOR + 1))
+          if [ $MINOR -gt 99 ]; then
+            MINOR=0
+            MAJOR=$((MAJOR + 1))
+          fi
+          NEXT=$(printf "%02d.%02d.00" $MAJOR $MINOR)
+
+          # Bump version on dev via API (README + manifest)
+          # Update README.md on dev
+          README_RESP=$(curl -sf -H "Authorization: token ${TOKEN}" "${API_BASE}/contents/README.md?ref=dev" 2>/dev/null || true)
+          README_SHA=$(echo "$README_RESP" | python3 -c "import sys,json; print(json.load(sys.stdin).get('sha',''))" 2>/dev/null || true)
+          README_CONTENT=$(echo "$README_RESP" | python3 -c "import sys,json,base64; print(base64.b64decode(json.load(sys.stdin).get('content','')).decode())" 2>/dev/null || true)
+          if [ -n "$README_SHA" ] && [ -n "$README_CONTENT" ]; then
+            UPDATED=$(echo "$README_CONTENT" | sed "s/${VERSION}/${NEXT}/g")
+            ENCODED=$(echo "$UPDATED" | base64 -w0)
+            curl -sf -X PUT -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" \
+              "${API_BASE}/contents/README.md" \
+              -d "$(python3 -c "import json; print(json.dumps({'content':'${ENCODED}','sha':'${README_SHA}','message':'chore(version): bump ${VERSION} → ${NEXT} (dev) [skip ci]','branch':'dev'}))")" > /dev/null 2>&1 || true
+          fi
+
+          # Update manifest on dev (Joomla or Dolibarr)
+          case "$PLATFORM" in
+            joomla)
+              MANIFEST_PATH="${{ steps.platform.outputs.manifest }}"
+              [ -n "$MANIFEST_PATH" ] && MANIFEST_PATH=$(echo "$MANIFEST_PATH" | sed 's|^\./||')
+              if [ -n "$MANIFEST_PATH" ]; then
+                ENCODED_PATH=$(python3 -c "import urllib.parse; print(urllib.parse.quote('${MANIFEST_PATH}'))")
+                MF_RESP=$(curl -sf -H "Authorization: token ${TOKEN}" "${API_BASE}/contents/${ENCODED_PATH}?ref=dev" 2>/dev/null || true)
+                MF_SHA=$(echo "$MF_RESP" | python3 -c "import sys,json; print(json.load(sys.stdin).get('sha',''))" 2>/dev/null || true)
+                MF_CONTENT=$(echo "$MF_RESP" | python3 -c "import sys,json,base64; print(base64.b64decode(json.load(sys.stdin).get('content','')).decode())" 2>/dev/null || true)
+                if [ -n "$MF_SHA" ] && [ -n "$MF_CONTENT" ]; then
+                  UPDATED=$(echo "$MF_CONTENT" | sed "s|<version>${VERSION}</version>|<version>${NEXT}</version>|")
+                  ENCODED=$(echo "$UPDATED" | base64 -w0)
+                  curl -sf -X PUT -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" \
+                    "${API_BASE}/contents/${ENCODED_PATH}" \
+                    -d "$(python3 -c "import json; print(json.dumps({'content':'${ENCODED}','sha':'${MF_SHA}','message':'chore(version): bump ${VERSION} → ${NEXT} (dev) [skip ci]','branch':'dev'}))")" > /dev/null 2>&1 || true
+                fi
+              fi
+              ;;
+            dolibarr)
+              # Dolibarr handled by separate step below
+              ;;
+          esac
+
+          echo "Dev branch bumped to ${NEXT}" >> $GITHUB_STEP_SUMMARY
 
 
       # -- Dolibarr post-release: Reset dev version -----------------------------

README.md

@@ -12,7 +12,7 @@ A modern, lightweight Joomla site template built on Cassiopeia with Font Awesome
 | | |
 |---|---|
 | **Type** | Joomla Site Template |
-| **Version** | 02.02.00 |
+| **Version** | 02.03.00 |
 | **Joomla** | 5.x / 6.x |
 | **PHP** | 8.1+ |
 | **License** | GPL-3.0-or-later |

src/templateDetails.xml

@@ -39,7 +39,7 @@
 		</server>
 	</updateservers>
 	<name>MokoOnyx</name>
-	<version>02.02.00</version>
+	<version>02.03.00</version>
 	<scriptfile>script.php</scriptfile>
 	<creationDate>2026-05-16</creationDate>
 	<author>Jonathan Miller || Moko Consulting</author>