ci: auto pre-release on push to dev/alpha/beta/rc branches [skip ci]

Submodule reference removed from MokoWaaS; this workflow is no longer needed.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.mokogitea/workflows/pre-release.yml

@@ -8,19 +8,17 @@
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /templates/workflows/universal/pre-release.yml.template
 # VERSION: 05.01.00
-# BRIEF: Manual pre-release -- builds dev/alpha/beta/rc packages from any branch
+# BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 
 name: "Universal: Pre-Release"
 
 on:
-  pull_request:
+  push:
-    types: [closed]
     branches:
       - dev
-  pull_request_target:
+      - alpha
-    types: [synchronize, opened, reopened]
+      - beta
-    branches:
+      - rc
-      - main
   workflow_dispatch:
     inputs:
       stability:
@@ -43,12 +41,11 @@ env:
 
 jobs:
   build:
-    name: "Build Pre-Release (${{ inputs.stability || 'development' }})"
+    name: "Build Pre-Release (${{ inputs.stability || github.ref_name }})"
     runs-on: release
     if: >-
       github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'dev') ||
+      github.event_name == 'push'
-      (github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == 'main')
 
     steps:
       - name: Checkout
@@ -56,23 +53,28 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.MOKOGITEA_TOKEN }}
-          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || '' }}
+          ref: ${{ github.ref_name }}
 
       - name: Setup moko-platform tools
         env:
           MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
         run: |
-          if ! command -v composer &> /dev/null; then
+          # Use pre-installed /opt/moko-platform if available (updated by cron every 6h)
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/cli/manifest_element.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/moko-platform
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
-          echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
 
       - name: Detect platform
         id: platform
@@ -82,9 +84,14 @@ jobs:
       - name: Resolve metadata and bump version
         id: meta
         run: |
-          # Auto-detect stability: RC for PRs targeting main, else use input or default to development
+          # Auto-detect stability from branch name on push, or use input on dispatch
-          if [ "${{ github.event_name }}" = "pull_request_target" ] && [ "${{ github.event.pull_request.base.ref }}" = "main" ]; then
+          if [ "${{ github.event_name }}" = "push" ]; then
-            STABILITY="release-candidate"
+            case "${{ github.ref_name }}" in
+              rc)    STABILITY="release-candidate" ;;
+              alpha) STABILITY="alpha" ;;
+              beta)  STABILITY="beta" ;;
+              *)     STABILITY="development" ;;
+            esac
           else
             STABILITY="${{ inputs.stability || 'development' }}"
           fi
@@ -96,20 +103,26 @@ jobs:
             release-candidate)  SUFFIX="-rc";    TAG="release-candidate" ;;
           esac
 
-          # Read current version (bump already handled by push workflow)
+          # Bump version via CLI: patch for dev/alpha/beta, minor for RC
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null)
+          case "$STABILITY" in
-          [ -z "$VERSION" ] && VERSION="00.00.01"
+            release-candidate) BUMP="minor" ;;
+            *)                 BUMP="patch" ;;
+          esac
 
-          # Strip any existing suffix from version before applying stability
+          php ${MOKO_CLI}/version_bump.php --path . $([ "$BUMP" = "minor" ] && echo "--minor") 2>/dev/null || true
+
+          # Set stability suffix and verify consistency
+          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "00.00.01")
           VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
 
           php ${MOKO_CLI}/version_set_platform.php \
             --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
-
-          # Verify version consistency across all files
           php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
 
-          # Update VERSION variable with suffix
+          # Ensure licensing tags (updateservers, dlid) if enabled in manifest.xml
+          php ${MOKO_CLI}/manifest_licensing.php --path . --fix 2>/dev/null || true
+
+          # Append suffix for output
           if [ -n "$SUFFIX" ]; then
             VERSION="${VERSION}${SUFFIX}"
           fi
@@ -153,21 +166,41 @@ jobs:
           php ${MOKO_CLI}/release_create.php \
             --path . --version "$VERSION" --tag "$TAG" \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --branch dev --prerelease
+            --repo "${GITEA_REPO}" --branch "${{ github.ref_name }}" --prerelease
 
-      - name: Ensure prerelease flag
+      - name: Update release notes from CHANGELOG.md
         run: |
           TAG="${{ steps.meta.outputs.tag }}"
+          VERSION="${{ steps.meta.outputs.version }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          # Get release ID by tag and force prerelease=true
+
-          RELEASE_ID=$(curl -s "${API_BASE}/releases/tags/${TAG}" \
+          # Extract [Unreleased] section from changelog (everything between [Unreleased] and next ## heading)
-            -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" | jq -r '.id // empty')
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Release ${VERSION}"
+          else
+            NOTES="Release ${VERSION}"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/${TAG}" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
           if [ -n "$RELEASE_ID" ]; then
-            curl -s -X PATCH "${API_BASE}/releases/${RELEASE_ID}" \
+            python3 -c "
-              -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+          import json, urllib.request
-              -H "Content-Type: application/json" \
+          body = open('/dev/stdin').read()
-              -d '{"prerelease": true}'
+          payload = json.dumps({'body': body}).encode()
-            echo "Marked release ${TAG} (id=${RELEASE_ID}) as prerelease"
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
           fi
 
       - name: Build package and upload
@@ -181,55 +214,8 @@ jobs:
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
             --repo "${GITEA_REPO}" --output /tmp || true
 
-      - name: Update updates.xml
+      # updates.xml is generated dynamically by MokoGitea license server
-        if: steps.platform.outputs.platform == 'joomla'
+      # No need to build, commit, or sync updates.xml from workflows
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
-
-          if [ ! -f "updates.xml" ]; then
-            echo "No updates.xml -- skipping"
-            exit 0
-          fi
-
-          SHA_FLAG=""
-          [ -n "$SHA256" ] && SHA_FLAG="--sha ${SHA256}"
-
-          php ${MOKO_CLI}/updates_xml_build.php \
-            --path . --version "${VERSION}" --stability "${STABILITY}" \
-            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
-            ${SHA_FLAG}
-
-          # Commit and push
-          if ! git diff --quiet updates.xml 2>/dev/null; then
-            git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-            git config --local user.name "gitea-actions[bot]"
-            git add updates.xml
-            git commit -m "chore: update ${STABILITY} channel ${VERSION} [skip ci]"
-            git push origin HEAD 2>&1 || echo "WARNING: push failed"
-          fi
-
-      - name: "Sync updates.xml to all branches"
-        if: steps.platform.outputs.platform == 'joomla'
-        run: |
-          CURRENT_BRANCH="${{ github.ref_name }}"
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-
-          for BRANCH in main dev; do
-            [ "$BRANCH" = "$CURRENT_BRANCH" ] && continue
-            echo "Syncing updates.xml -> ${BRANCH}"
-            git fetch origin "${BRANCH}" 2>/dev/null || continue
-            git checkout "origin/${BRANCH}" -- updates.xml 2>/dev/null || continue
-            git checkout "${CURRENT_BRANCH}" -- updates.xml
-            if ! git diff --quiet updates.xml 2>/dev/null; then
-              git add updates.xml
-              git commit -m "chore: sync updates.xml from ${CURRENT_BRANCH} [skip ci]"
-              git push origin HEAD:refs/heads/${BRANCH} 2>&1 || echo "WARNING: push to ${BRANCH} failed"
-            fi
-            git checkout "${CURRENT_BRANCH}" 2>/dev/null
-          done
 
       - name: "Delete lesser pre-release channels (cascade)"
         continue-on-error: true

.mokogitea/workflows/update-submodule-waas.yml

@@ -1,106 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# BRIEF: Update MokoOnyx submodule in MokoWaas on main and dev branches
-
-name: "Update MokoWaas Submodule"
-
-on:
-  release:
-    types: [published]
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-  WAAS_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
-  WAAS_REPO: MokoWaaS
-  # Path where MokoOnyx lives as a submodule inside MokoWaaS
-  SUBMODULE_PATH: src/packages/tpl_mokoonyx
-
-permissions:
-  contents: read
-
-jobs:
-  update-submodule:
-    name: "Update submodule on ${{ matrix.branch }}"
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        branch: [main, dev]
-      fail-fast: false
-
-    steps:
-      - name: Get release info
-        id: release
-        run: |
-          TAG="${{ github.event.release.tag_name }}"
-          IS_PRE="${{ github.event.release.prerelease }}"
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-          echo "prerelease=${IS_PRE}" >> $GITHUB_OUTPUT
-          echo "Release tag: ${TAG} (prerelease: ${IS_PRE})"
-
-      # Skip pre-releases (RC) — only update on stable releases
-      - name: Skip pre-releases
-        if: steps.release.outputs.prerelease == 'true'
-        run: |
-          echo "Skipping pre-release ${TAG} — only stable releases update MokoWaas"
-          exit 0
-
-      - name: Clone MokoWaas
-        if: steps.release.outputs.prerelease != 'true'
-        run: |
-          git clone --branch "${{ matrix.branch }}" --depth 1 --recurse-submodules \
-            "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${WAAS_ORG}/${WAAS_REPO}.git" \
-            waas
-        env:
-          GIT_TERMINAL_PROMPT: 0
-
-      - name: Configure git
-        if: steps.release.outputs.prerelease != 'true'
-        working-directory: waas
-        run: |
-          git config user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config user.name "gitea-actions[bot]"
-          git remote set-url origin \
-            "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${WAAS_ORG}/${WAAS_REPO}.git"
-
-      - name: Update submodule to release tag
-        if: steps.release.outputs.prerelease != 'true'
-        working-directory: waas
-        run: |
-          TAG="${{ steps.release.outputs.tag }}"
-          SUBPATH="${SUBMODULE_PATH}"
-
-          # Verify submodule exists
-          if [ ! -f ".gitmodules" ] || ! grep -q "${SUBPATH}" .gitmodules; then
-            echo "::error::Submodule '${SUBPATH}' not found in .gitmodules on ${{ matrix.branch }}"
-            exit 1
-          fi
-
-          # Fetch the tag in the submodule and update to it
-          cd "${SUBPATH}"
-          git fetch origin "refs/tags/${TAG}:refs/tags/${TAG}" --depth 1
-          git checkout "${TAG}"
-          cd -
-
-          # Stage the submodule pointer change
-          git add "${SUBPATH}"
-
-          # Only commit if there's actually a change
-          if git diff --cached --quiet; then
-            echo "Submodule already at ${TAG} on ${{ matrix.branch }} — nothing to do"
-          else
-            git commit -m "chore: update MokoOnyx submodule to ${TAG}
-
-Authored-by: Moko Consulting"
-            git push origin "${{ matrix.branch }}"
-            echo "Updated MokoOnyx to ${TAG} on ${{ matrix.branch }}"
-          fi
-
-      - name: Summary
-        if: always() && steps.release.outputs.prerelease != 'true'
-        run: |
-          TAG="${{ steps.release.outputs.tag }}"
-          echo "## MokoWaas Submodule Update (${{ matrix.branch }})" >> $GITHUB_STEP_SUMMARY
-          echo "Updated \`${SUBMODULE_PATH}\` to \`${TAG}\`" >> $GITHUB_STEP_SUMMARY