From 406242fb7d7de5520cf11f30d87ca882205252b0 Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Sun, 24 May 2026 03:08:12 +0000 Subject: [PATCH 1/4] chore: sync updates.xml 02.02.00 [skip ci] --- updates.xml | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/updates.xml b/updates.xml index bce2c2d..9c88078 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -10,15 +10,87 @@ System - MokoWaaS update mokowaas plugin - 02.01.43-dev + 02.02.00-dev site system development https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/plg_system_mokowaas-02.01.43-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip - 1f5c758274e9fa559df225f6ff8134e2b30b06bbfde1289667aaa2c0f0a07500 + 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff + + Moko Consulting + https://mokoconsulting.tech + + + System - MokoWaaS + System - MokoWaaS update + mokowaas + plugin + 02.02.00-alpha + site + system + alpha + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/alpha + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip + + 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff + + Moko Consulting + https://mokoconsulting.tech + + + System - MokoWaaS + System - MokoWaaS update + mokowaas + plugin + 02.02.00-beta + site + system + beta + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/beta + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip + + 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff + + Moko Consulting + https://mokoconsulting.tech + + + System - MokoWaaS + System - MokoWaaS update + mokowaas + plugin + 02.02.00-rc + site + system + rc + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/rc + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip + + 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff + + Moko Consulting + https://mokoconsulting.tech + + + System - MokoWaaS + System - MokoWaaS update + mokowaas + plugin + 02.02.00 + site + system + stable + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip + + 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff Moko Consulting https://mokoconsulting.tech -- 2.52.0 From 7e3d3660433e4d9902536a31714f54c8be9b9ff5 Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Sun, 24 May 2026 03:33:54 +0000 Subject: [PATCH 2/4] chore: sync updates.xml 02.01.44 from dev [skip ci] --- updates.xml | 80 +++-------------------------------------------------- 1 file changed, 4 insertions(+), 76 deletions(-) diff --git a/updates.xml b/updates.xml index 9c88078..86b95b2 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -10,87 +10,15 @@ System - MokoWaaS update mokowaas plugin - 02.02.00-dev + 02.01.44-dev site system 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/plg_system_mokowaas-02.01.44-dev.zip - 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff - - Moko Consulting - https://mokoconsulting.tech - - - System - MokoWaaS - System - MokoWaaS update - mokowaas - plugin - 02.02.00-alpha - site - system - alpha - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/alpha - - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip - - 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff - - Moko Consulting - https://mokoconsulting.tech - - - System - MokoWaaS - System - MokoWaaS update - mokowaas - plugin - 02.02.00-beta - site - system - beta - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/beta - - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip - - 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff - - Moko Consulting - https://mokoconsulting.tech - - - System - MokoWaaS - System - MokoWaaS update - mokowaas - plugin - 02.02.00-rc - site - system - rc - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/rc - - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip - - 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff - - Moko Consulting - https://mokoconsulting.tech - - - System - MokoWaaS - System - MokoWaaS update - mokowaas - plugin - 02.02.00 - site - system - stable - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable - - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip - - 087ad1e6f2ece81159ebd4a75ce7619da1f1c37513c98edd3c324b86c95cf7ff + 134158cce6b179a68477f35400f54e21f336bceae7b4a6197af3cb80db458a5a Moko Consulting https://mokoconsulting.tech -- 2.52.0 From feaccf0758864b1bb668aeaefbab732175986461 Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Sun, 24 May 2026 03:39:45 +0000 Subject: [PATCH 3/4] fix: updates.xml add stable channel entry [skip ci] --- updates.xml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/updates.xml b/updates.xml index 86b95b2..de83745 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -10,6 +10,23 @@ System - MokoWaaS update mokowaas plugin + 02.02.00 + site + system + stable + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02 + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/plg_system_mokowaas-02.02.00.zip + + + Moko Consulting + https://mokoconsulting.tech + + + System - MokoWaaS + System - MokoWaaS update (development) + mokowaas + plugin 02.01.44-dev site system -- 2.52.0 From d4706696346549600e42fdcd5346434080a31ae5 Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Sun, 24 May 2026 03:40:50 +0000 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20remove=20deploy=20workflow=20?= =?UTF-8?q?=E2=80=94=20switching=20to=20Joomla=20update=20server=20method?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .mokogitea/workflows/deploy-manual.yml | 126 ------------------------- 1 file changed, 126 deletions(-) delete mode 100644 .mokogitea/workflows/deploy-manual.yml diff --git a/.mokogitea/workflows/deploy-manual.yml b/.mokogitea/workflows/deploy-manual.yml deleted file mode 100644 index bb133ed..0000000 --- a/.mokogitea/workflows/deploy-manual.yml +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright (C) 2026 Moko Consulting -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# FILE INFORMATION -# DEFGROUP: Gitea.Workflow -# INGROUP: MokoStandards.Deploy -# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API -# PATH: /templates/workflows/joomla/deploy-manual.yml.template -# VERSION: 04.07.00 -# BRIEF: Manual SFTP deploy to dev server for Joomla repos - -name: "Universal: Deploy to Dev (Manual)" - -on: - workflow_dispatch: - inputs: - clear_remote: - description: 'Delete all remote files before uploading' - required: false - default: 'false' - type: boolean - -env: - FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true - -permissions: - contents: read - -jobs: - deploy: - name: SFTP Deploy to Dev - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - - - name: Setup PHP - run: | - php -v && composer --version - - - name: Setup MokoStandards tools - env: - GA_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }} - MOKO_CLONE_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }} - MOKO_CLONE_HOST: ${{ secrets.GA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }} - COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GA_TOKEN || github.token }}"}}' - run: | - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \ - /tmp/mokostandards-api 2>/dev/null || true - if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then - cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true - fi - - - name: Check FTP configuration - id: check - env: - HOST: ${{ vars.DEV_FTP_HOST }} - PATH_VAR: ${{ vars.DEV_FTP_PATH }} - PORT: ${{ vars.DEV_FTP_PORT }} - run: | - if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then - echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy" - echo "skip=true" >> "$GITHUB_OUTPUT" - exit 0 - fi - echo "skip=false" >> "$GITHUB_OUTPUT" - echo "host=$HOST" >> "$GITHUB_OUTPUT" - - REMOTE="${PATH_VAR%/}" - echo "remote=$REMOTE" >> "$GITHUB_OUTPUT" - - [ -z "$PORT" ] && PORT="22" - echo "port=$PORT" >> "$GITHUB_OUTPUT" - - - name: Deploy via SFTP - if: steps.check.outputs.skip != 'true' - env: - SFTP_KEY: ${{ secrets.DEV_FTP_KEY }} - SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }} - SFTP_USER: ${{ vars.DEV_FTP_USERNAME }} - run: | - SOURCE_DIR="src" - [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs" - [ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; } - - printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \ - "${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \ - > /tmp/sftp-config.json - - if [ -n "$SFTP_KEY" ]; then - echo "$SFTP_KEY" > /tmp/deploy_key - chmod 600 /tmp/deploy_key - printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json - else - printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json - fi - - DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json) - [ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote) - - PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true) - if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then - php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}" - else - php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}" - fi - - rm -f /tmp/deploy_key /tmp/sftp-config.json - - - name: Summary - if: always() - run: | - if [ "${{ steps.check.outputs.skip }}" = "true" ]; then - echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY - else - echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY - echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY - echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY - echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY - echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY - fi -- 2.52.0