From cff932dcbbbde18b026773fe3040d06c6d2f55bf Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Mon, 25 May 2026 03:54:55 +0000 Subject: [PATCH 1/2] chore(release): build 02.04.00 [skip ci] --- README.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_mokowaas/mokowaas.xml | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 72 +++++++++++++------ 6 files changed, 55 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index a341c73..27d3528 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.03.12 + VERSION: 02.04.00 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 155f0b4..e82979b 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.03.11 + 02.04.00 Minimal API-only component for MokoWaaS. Provides REST endpoints for site health, cache, updates, and backups. Moko\Component\MokoWaaS\Api diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index e7f7e1c..ba300ea 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.03.11 + 02.04.00 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 5d07b58..89cd3ca 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.03.11 + 02.04.00 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 5fb2655..b08b9a5 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ MokoWaaS mokowaas - 02.03.11 + 02.04.00 2026-05-23 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index db989af..59451d3 100644 --- a/updates.xml +++ b/updates.xml @@ -1,20 +1,20 @@ MokoWaaS - MokoWaaS stable update - pkg_mokowaas + MokoWaaS update + mokowaas package - 02.02.00 - stable - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02 + 02.04.00-dev + development + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.04.00-dev.zip Moko Consulting @@ -22,31 +22,59 @@ MokoWaaS - MokoWaaS development build (package) - pkg_mokowaas + MokoWaaS update + mokowaas package - 02.03.11-dev - development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development + 02.04.00-alpha + alpha + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/alpha - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.03.11-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/alpha/pkg_mokowaas-02.04.00-alpha.zip Moko Consulting https://mokoconsulting.tech - System - MokoWaaS - MokoWaaS development build (legacy plugin upgrade) + MokoWaaS + MokoWaaS update mokowaas - plugin - system - site - 02.03.11-dev - development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development + package + 02.04.00-beta + beta + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/beta - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.03.11-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/beta/pkg_mokowaas-02.04.00-beta.zip + + + Moko Consulting + https://mokoconsulting.tech + + + MokoWaaS + MokoWaaS update + mokowaas + package + 02.04.00-rc + rc + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/rc + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/rc/pkg_mokowaas-02.04.00-rc.zip + + + Moko Consulting + https://mokoconsulting.tech + + + MokoWaaS + MokoWaaS update + mokowaas + package + 02.04.00 + stable + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/pkg_mokowaas-02.04.00.zip Moko Consulting -- 2.52.0 From 7b5a83c71a64d2ace46ae7ccc411173709ab8403 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sun, 24 May 2026 22:59:07 -0500 Subject: [PATCH 2/2] fix(ci): strip type prefix from element in auto-release workflow Prevents pkg_pkg_ duplication in release names, ZIP filenames, and SHA256 checksums. Uses for packages and strips existing prefixes before prepending type prefix. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .mokogitea/workflows/auto-release.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.mokogitea/workflows/auto-release.yml b/.mokogitea/workflows/auto-release.yml index 787b7a0..f02823b 100644 --- a/.mokogitea/workflows/auto-release.yml +++ b/.mokogitea/workflows/auto-release.yml @@ -339,6 +339,8 @@ jobs: [ -z "$NOTES" ] && NOTES="Release ${VERSION}" # Build release name: "Pretty Name VERSION (type_element-VERSION)" + # Strip existing type prefix to prevent duplication + EXT_ELEMENT=$(echo "$EXT_ELEMENT" | sed -E 's/^(pkg_|com_|mod_|plg_[a-z]+_|tpl_|lib_)//') TYPE_PREFIX="" case "${EXT_TYPE}" in plugin) TYPE_PREFIX="plg_${EXT_FOLDER}_" ;; @@ -409,6 +411,13 @@ jobs: # ZIP name: type_folder_element-VERSION (e.g. plg_system_mokojgdpc-01.01.00.zip) EXT_TYPE=$(sed -n 's/.*]*type="\([^"]*\)".*/\1/p' "$MANIFEST" | head -1) EXT_FOLDER=$(sed -n 's/.*]*group="\([^"]*\)".*/\1/p' "$MANIFEST" | head -1) + # For packages, prefer over filename-derived element + if [ "$EXT_TYPE" = "package" ]; then + PKG_NAME=$(sed -n 's/.*\([^<]*\)<\/packagename>.*/\1/p' "$MANIFEST" 2>/dev/null | head -1) + [ -n "$PKG_NAME" ] && EXT_ELEMENT="$PKG_NAME" + fi + # Strip existing type prefix to prevent duplication (e.g. pkg_mokowaas → mokowaas) + EXT_ELEMENT=$(echo "$EXT_ELEMENT" | sed -E 's/^(pkg_|com_|mod_|plg_[a-z]+_|tpl_|lib_)//') TYPE_PREFIX="" case "${EXT_TYPE}" in plugin) TYPE_PREFIX="plg_${EXT_FOLDER}_" ;; @@ -570,6 +579,7 @@ jobs: EXT_FOLDER="${{ steps.updates.outputs.ext_folder }}" # Build TYPE_PREFIX to match Step 8's ZIP naming + EXT_ELEMENT=$(echo "$EXT_ELEMENT" | sed -E 's/^(pkg_|com_|mod_|plg_[a-z]+_|tpl_|lib_)//') TYPE_PREFIX="" case "${EXT_TYPE}" in plugin) TYPE_PREFIX="plg_${EXT_FOLDER}_" ;; -- 2.52.0