From faead32d07ac798e5aa417a127b6106a05245a11 Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Tue, 2 Jun 2026 19:04:26 +0000 Subject: [PATCH 1/2] chore: sync updates.xml 02.17.00 from main [skip ci] --- updates.xml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 41179a7..6192e76 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -13,15 +13,35 @@ site 02.16.01-dev 2026-05-31 - https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/development + https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/development/tpl_mokoonyx-02.16.01-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/development/tpl_mokoonyx-02.16.01-dev.zip 32afd0081daa16bb8e89fbd29f2780f95ea910c34a3c12c9a5b3535a83c3b97c dev https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md Moko Consulting https://mokoconsulting.tech + + 8.1.0 + + + Template - MokoOnyx + Template - MokoOnyx stable build. + mokoonyx + template + site + 02.17.00 + 2026-06-02 + https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/stable + + https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/stable/tpl_mokoonyx-02.17.00.zip + + 648aa83390654b244bd5f5f1dfd91c34e61637c7b54b5c52858bb0337ceea62e + stable + https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md + Moko Consulting + https://mokoconsulting.tech 8.1.0 -- 2.52.0 From a16949fd4d80a344604bd94a81e6b2a6f29eaad5 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:26:31 -0500 Subject: [PATCH 2/2] feat(ci): auto-update MokoOnyx submodule in MokoWaaS on release Triggers on stable releases, updates src/packages/tpl_mokoonyx submodule pointer on both main and dev branches of MokoWaaS. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../workflows/update-submodule-waas.yml | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .mokogitea/workflows/update-submodule-waas.yml diff --git a/.mokogitea/workflows/update-submodule-waas.yml b/.mokogitea/workflows/update-submodule-waas.yml new file mode 100644 index 0000000..39461ce --- /dev/null +++ b/.mokogitea/workflows/update-submodule-waas.yml @@ -0,0 +1,106 @@ +# Copyright (C) 2026 Moko Consulting +# +# 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 -- 2.52.0