chore: Sync MokoStandards v04.04 #110

Closed
jmiller-moko wants to merge 54 commits from chore/sync-mokostandards-v04.04 into main
15 changed files with 283 additions and 155 deletions
Showing only changes of commit 3f7ac82ab6 - Show all commits

View File

@@ -6,7 +6,7 @@
# INGROUP: MokoStandards.Workflows.Shared # INGROUP: MokoStandards.Workflows.Shared
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /.github/workflows/auto-assign.yml # PATH: /.github/workflows/auto-assign.yml
# VERSION: 04.05.11 # VERSION: 04.06.00
# BRIEF: Auto-assign jmiller-moko to unassigned issues and PRs every 15 minutes # BRIEF: Auto-assign jmiller-moko to unassigned issues and PRs every 15 minutes
name: Auto-Assign Issues & PRs name: Auto-Assign Issues & PRs

View File

@@ -9,7 +9,7 @@
# INGROUP: MokoStandards.Automation # INGROUP: MokoStandards.Automation
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/shared/auto-dev-issue.yml.template # PATH: /templates/workflows/shared/auto-dev-issue.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: Auto-create tracking issue with sub-issues for dev/rc branch workflow # BRIEF: Auto-create tracking issue with sub-issues for dev/rc branch workflow
# NOTE: Synced via bulk-repo-sync to .github/workflows/auto-dev-issue.yml in all governed repos. # NOTE: Synced via bulk-repo-sync to .github/workflows/auto-dev-issue.yml in all governed repos.
@@ -39,7 +39,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: >- if: >-
(github.event_name == 'workflow_dispatch') || (github.event_name == 'workflow_dispatch') ||
(github.event.ref_type == 'branch' && startsWith(github.event.ref, 'rc/')) (github.event.ref_type == 'branch' &&
(startsWith(github.event.ref, 'rc/') ||
startsWith(github.event.ref, 'alpha/') ||
startsWith(github.event.ref, 'beta/')))
steps: steps:
- name: Create tracking issue and sub-issues - name: Create tracking issue and sub-issues
@@ -62,6 +65,16 @@ jobs:
BRANCH_TYPE="Release Candidate" BRANCH_TYPE="Release Candidate"
LABEL_TYPE="type: release" LABEL_TYPE="type: release"
TITLE_PREFIX="rc" TITLE_PREFIX="rc"
elif [[ "$BRANCH" == beta/* ]]; then
VERSION="${BRANCH#beta/}"
BRANCH_TYPE="Beta"
LABEL_TYPE="type: release"
TITLE_PREFIX="beta"
elif [[ "$BRANCH" == alpha/* ]]; then
VERSION="${BRANCH#alpha/}"
BRANCH_TYPE="Alpha"
LABEL_TYPE="type: release"
TITLE_PREFIX="alpha"
else else
VERSION="${BRANCH#dev/}" VERSION="${BRANCH#dev/}"
BRANCH_TYPE="Development" BRANCH_TYPE="Development"
@@ -80,14 +93,20 @@ jobs:
exit 0 exit 0
fi fi
# ── Define sub-issues for the dev workflow ──────────────────────── # ── Define sub-issues for the workflow ────────────────────────
if [[ "$BRANCH" == rc/* ]]; then if [[ "$BRANCH" == rc/* ]]; then
SUB_ISSUES=( SUB_ISSUES=(
"RC Testing|Verify all features work on rc branch|type: test,release-candidate" "RC Testing|Verify all features work on rc branch|type: test,release-candidate"
"Regression Testing|Run full regression suite before merge to main|type: test,release-candidate" "Regression Testing|Run full regression suite before merge|type: test,release-candidate"
"Version Bump|Bump version in README.md and all headers|type: version,release-candidate" "Version Bump|Bump version in README.md and all headers|type: version,release-candidate"
"Changelog Update|Update CHANGELOG.md with release notes|documentation,release-candidate" "Changelog Update|Update CHANGELOG.md with release notes|documentation,release-candidate"
"Merge to Main|Create PR from rc branch to main|type: release,needs-review" "Merge to Version Branch|Create PR to version/XX|type: release,needs-review"
)
elif [[ "$BRANCH" == alpha/* ]] || [[ "$BRANCH" == beta/* ]]; then
SUB_ISSUES=(
"Testing|Verify features on ${BRANCH_TYPE} branch|type: test,status: in-progress"
"Bug Fixes|Fix issues found during ${BRANCH_TYPE} testing|type: bug,status: pending"
"Promote to Next Stage|Create PR to promote to next release stage|type: release,needs-review"
) )
else else
SUB_ISSUES=( SUB_ISSUES=(
@@ -156,22 +175,26 @@ jobs:
done done
fi fi
# ── RC: Create or update release-candidate release ────────────── # ── Create or update prerelease for alpha/beta/rc ────────────────
if [[ "$BRANCH" == rc/* ]]; then if [[ "$BRANCH" == rc/* ]] || [[ "$BRANCH" == alpha/* ]] || [[ "$BRANCH" == beta/* ]]; then
RELEASE_TAG="release-candidate" case "$BRANCH_TYPE" in
EXISTING=$(gh release view "$RELEASE_TAG" --json tagName -q .tagName 2>/dev/null || true) Alpha) RELEASE_TAG="alpha" ;;
Beta) RELEASE_TAG="beta" ;;
"Release Candidate") RELEASE_TAG="release-candidate" ;;
esac
EXISTING=$(gh release view "$RELEASE_TAG" --json tagName -q .tagName 2>/dev/null || true)
if [ -z "$EXISTING" ]; then if [ -z "$EXISTING" ]; then
gh release create "$RELEASE_TAG" \ gh release create "$RELEASE_TAG" \
--title "release-candidate (${VERSION})" \ --title "${RELEASE_TAG} (${VERSION})" \
--notes "## Release Candidate ${VERSION}\n\nRC branch: \`${BRANCH}\`\nTracking issue: ${PARENT_URL}" \ --notes "## ${BRANCH_TYPE} ${VERSION}\n\nBranch: \`${BRANCH}\`\nTracking issue: ${PARENT_URL}" \
--prerelease \ --prerelease \
--target main 2>/dev/null || true --target main 2>/dev/null || true
echo "RC release created: ${RELEASE_TAG}" >> $GITHUB_STEP_SUMMARY echo "${BRANCH_TYPE} release created: ${RELEASE_TAG}" >> $GITHUB_STEP_SUMMARY
else else
gh release edit "$RELEASE_TAG" \ gh release edit "$RELEASE_TAG" \
--title "release-candidate (${VERSION})" --prerelease 2>/dev/null || true --title "${RELEASE_TAG} (${VERSION})" --prerelease 2>/dev/null || true
echo "RC release updated: ${RELEASE_TAG}" >> $GITHUB_STEP_SUMMARY echo "${BRANCH_TYPE} release updated: ${RELEASE_TAG}" >> $GITHUB_STEP_SUMMARY
fi fi
fi fi

View File

@@ -7,7 +7,7 @@
# INGROUP: MokoStandards.Release # INGROUP: MokoStandards.Release
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/joomla/auto-release.yml.template # PATH: /templates/workflows/joomla/auto-release.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: Joomla build & release — ZIP package, updates.xml, SHA-256 checksum # BRIEF: Joomla build & release — ZIP package, updates.xml, SHA-256 checksum
# #
# +========================================================================+ # +========================================================================+
@@ -316,54 +316,47 @@ jobs:
DOWNLOAD_URL="https://github.com/${REPO}/releases/download/v${VERSION}/${EXT_ELEMENT}-${VERSION}.zip" DOWNLOAD_URL="https://github.com/${REPO}/releases/download/v${VERSION}/${EXT_ELEMENT}-${VERSION}.zip"
INFO_URL="https://github.com/${REPO}/releases/tag/v${VERSION}" INFO_URL="https://github.com/${REPO}/releases/tag/v${VERSION}"
# -- Build stable entry ────────────────────────────────────── # -- Build stable entry to temp file ─────────────────────────
STABLE_ENTRY=$(cat <<XMLEOF {
<update> printf '%s\n' ' <update>'
<name>${EXT_NAME}</name> printf '%s\n' " <name>${EXT_NAME}</name>"
<description>${EXT_NAME} update</description> printf '%s\n' " <description>${EXT_NAME} update</description>"
<element>${EXT_ELEMENT}</element> printf '%s\n' " <element>${EXT_ELEMENT}</element>"
<type>${EXT_TYPE}</type> printf '%s\n' " <type>${EXT_TYPE}</type>"
<version>${VERSION}</version> printf '%s\n' " <version>${VERSION}</version>"
$([ -n "$CLIENT_TAG" ] && echo " ${CLIENT_TAG}") [ -n "$CLIENT_TAG" ] && printf '%s\n' " ${CLIENT_TAG}"
$([ -n "$FOLDER_TAG" ] && echo " ${FOLDER_TAG}") [ -n "$FOLDER_TAG" ] && printf '%s\n' " ${FOLDER_TAG}"
<tags> printf '%s\n' ' <tags>'
<tag>stable</tag> printf '%s\n' ' <tag>stable</tag>'
</tags> printf '%s\n' ' </tags>'
<infourl title="${EXT_NAME}">${INFO_URL}</infourl> printf '%s\n' " <infourl title=\"${EXT_NAME}\">${INFO_URL}</infourl>"
<downloads> printf '%s\n' ' <downloads>'
<downloadurl type="full" format="zip">${DOWNLOAD_URL}</downloadurl> printf '%s\n' " <downloadurl type=\"full\" format=\"zip\">${DOWNLOAD_URL}</downloadurl>"
</downloads> printf '%s\n' ' </downloads>'
${TARGET_PLATFORM} printf '%s\n' " ${TARGET_PLATFORM}"
$([ -n "$PHP_TAG" ] && echo " ${PHP_TAG}") [ -n "$PHP_TAG" ] && printf '%s\n' " ${PHP_TAG}"
<maintainer>Moko Consulting</maintainer> printf '%s\n' ' <maintainer>Moko Consulting</maintainer>'
<maintainerurl>https://mokoconsulting.tech</maintainerurl> printf '%s\n' ' <maintainerurl>https://mokoconsulting.tech</maintainerurl>'
</update> printf '%s\n' ' </update>'
XMLEOF } > /tmp/stable_entry.xml
)
# -- Write updates.xml preserving dev/rc entries ────────────── # -- Write updates.xml preserving dev/rc entries ──────────────
# Extract existing dev and rc entries if present
RC_ENTRY="" RC_ENTRY=""
DEV_ENTRY="" DEV_ENTRY=""
if [ -f "updates.xml" ]; then if [ -f "updates.xml" ]; then
RC_ENTRY=$(python3 -c " printf 'import re\n' > /tmp/extract.py
import re printf 'with open("updates.xml") as f: c = f.read()\n' >> /tmp/extract.py
with open('updates.xml') as f: c = f.read() printf 'import sys; tag = sys.argv[1]\n' >> /tmp/extract.py
m = re.search(r'( <update>.*?<tag>rc</tag>.*?</update>)', c, re.DOTALL) printf 'm = re.search(r"( <update>.*?<tag>" + re.escape(tag) + r"</tag>.*?</update>)", c, re.DOTALL)\n' >> /tmp/extract.py
if m: print(m.group(1)) printf 'if m: print(m.group(1))\n' >> /tmp/extract.py
" 2>/dev/null || true) RC_ENTRY=$(python3 /tmp/extract.py rc 2>/dev/null || true)
DEV_ENTRY=$(python3 -c " DEV_ENTRY=$(python3 /tmp/extract.py development 2>/dev/null || true)
import re
with open('updates.xml') as f: c = f.read()
m = re.search(r'( <update>.*?<tag>development</tag>.*?</update>)', c, re.DOTALL)
if m: print(m.group(1))
" 2>/dev/null || true)
fi fi
{ {
printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>' printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>'
printf '%s\n' '<updates>' printf '%s\n' '<updates>'
echo "$STABLE_ENTRY" cat /tmp/stable_entry.xml
[ -n "$RC_ENTRY" ] && echo "$RC_ENTRY" [ -n "$RC_ENTRY" ] && echo "$RC_ENTRY"
[ -n "$DEV_ENTRY" ] && echo "$DEV_ENTRY" [ -n "$DEV_ENTRY" ] && echo "$DEV_ENTRY"
printf '%s\n' '</updates>' printf '%s\n' '</updates>'

View File

@@ -5,7 +5,7 @@
# INGROUP: MokoCassiopeia.Automation # INGROUP: MokoCassiopeia.Automation
# REPO: https://github.com/mokoconsulting-tech/MokoCassiopeia # REPO: https://github.com/mokoconsulting-tech/MokoCassiopeia
# PATH: /.github/workflows/auto-update-sha.yml # PATH: /.github/workflows/auto-update-sha.yml
# VERSION: 01.00.00 # VERSION: 03.09.03
# BRIEF: Automatically update SHA-256 hash in updates.xml after release # BRIEF: Automatically update SHA-256 hash in updates.xml after release
# NOTE: Ensures updates.xml stays synchronized with release packages # NOTE: Ensures updates.xml stays synchronized with release packages

View File

@@ -9,7 +9,7 @@
# INGROUP: MokoStandards.CI # INGROUP: MokoStandards.CI
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/shared/changelog-validation.yml.template # PATH: /templates/workflows/shared/changelog-validation.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: Validates CHANGELOG.md format and version consistency # BRIEF: Validates CHANGELOG.md format and version consistency
# NOTE: Deployed to .github/workflows/changelog-validation.yml in governed repos. # NOTE: Deployed to .github/workflows/changelog-validation.yml in governed repos.

View File

@@ -9,7 +9,7 @@
# INGROUP: MokoStandards.CI # INGROUP: MokoStandards.CI
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/joomla/ci-joomla.yml.template # PATH: /templates/workflows/joomla/ci-joomla.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: CI workflow for Joomla extensions — lint, validate, test # BRIEF: CI workflow for Joomla extensions — lint, validate, test
# NOTE: Deployed to .github/workflows/ci-joomla.yml in governed Joomla extension repos. # NOTE: Deployed to .github/workflows/ci-joomla.yml in governed Joomla extension repos.

View File

@@ -9,7 +9,7 @@
# INGROUP: MokoStandards.Security # INGROUP: MokoStandards.Security
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/generic/codeql-analysis.yml.template # PATH: /templates/workflows/generic/codeql-analysis.yml.template
# VERSION: 04.05.00 # VERSION: 03.09.03
# BRIEF: CodeQL security scanning workflow (generic — all repo types) # BRIEF: CodeQL security scanning workflow (generic — all repo types)
# NOTE: Deployed to .github/workflows/codeql-analysis.yml in governed repos. # NOTE: Deployed to .github/workflows/codeql-analysis.yml in governed repos.
# CodeQL does not support PHP directly; JavaScript scans JSON/YAML/shell. # CodeQL does not support PHP directly; JavaScript scans JSON/YAML/shell.

132
.github/workflows/deploy-manual.yml vendored Normal file
View File

@@ -0,0 +1,132 @@
# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
# FILE INFORMATION
# DEFGROUP: GitHub.Workflow
# INGROUP: MokoStandards.Deploy
# REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/joomla/deploy-manual.yml.template
# VERSION: 04.06.00
# BRIEF: Manual SFTP deploy to dev server for Joomla repos
# NOTE: Joomla repos use update.xml for distribution. This is for manual
# dev server testing only — triggered via workflow_dispatch.
name: 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
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.31.0
with:
php-version: '8.2'
extensions: json, ssh2
tools: composer
coverage: none
- name: Setup MokoStandards tools
env:
GH_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_TOKEN || github.token }}"}}'
run: |
git clone --depth 1 --branch version/04 --quiet \
"https://x-access-token:${GH_TOKEN}@github.com/mokoconsulting-tech/MokoStandards.git" \
/tmp/mokostandards 2>/dev/null || true
if [ -d "/tmp/mokostandards" ] && [ -f "/tmp/mokostandards/composer.json" ]; then
cd /tmp/mokostandards && 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 }}
SUFFIX: ${{ vars.DEV_FTP_SUFFIX }}
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%/}"
[ -n "$SUFFIX" ] && REMOTE="${REMOTE}/${SUFFIX#/}"
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

View File

@@ -22,7 +22,7 @@
# INGROUP: MokoStandards.Firewall # INGROUP: MokoStandards.Firewall
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/shared/enterprise-firewall-setup.yml.template # PATH: /templates/workflows/shared/enterprise-firewall-setup.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: Enterprise firewall configuration — generates outbound allow-rules including SFTP deployment server # BRIEF: Enterprise firewall configuration — generates outbound allow-rules including SFTP deployment server
# NOTE: Reads DEV_FTP_HOST / DEV_FTP_PORT variables to include SFTP egress rules alongside HTTPS rules. # NOTE: Reads DEV_FTP_HOST / DEV_FTP_PORT variables to include SFTP egress rules alongside HTTPS rules.

View File

@@ -22,7 +22,7 @@
# INGROUP: MokoCassiopeia.Release # INGROUP: MokoCassiopeia.Release
# REPO: https://github.com/mokoconsulting-tech/MokoCassiopeia # REPO: https://github.com/mokoconsulting-tech/MokoCassiopeia
# PATH: /.github/workflows/release.yml # PATH: /.github/workflows/release.yml
# VERSION: 01.00.00 # VERSION: 03.09.03
# BRIEF: Automated release workflow for MokoCassiopeia Joomla template # BRIEF: Automated release workflow for MokoCassiopeia Joomla template
# NOTE: Creates release packages and publishes to GitHub Releases # NOTE: Creates release packages and publishes to GitHub Releases

View File

@@ -10,7 +10,7 @@
# INGROUP: MokoStandards.Validation # INGROUP: MokoStandards.Validation
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /.github/workflows/repo_health.yml # PATH: /.github/workflows/repo_health.yml
# VERSION: 04.05.00 # VERSION: 04.06.00
# BRIEF: Enforces repository guardrails by validating release configuration, scripts governance, tooling availability, and core repository health artifacts. # BRIEF: Enforces repository guardrails by validating release configuration, scripts governance, tooling availability, and core repository health artifacts.
# NOTE: Field is user-managed. # NOTE: Field is user-managed.
# ============================================================================ # ============================================================================

View File

@@ -9,7 +9,7 @@
# INGROUP: MokoStandards.Maintenance # INGROUP: MokoStandards.Maintenance
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/shared/repository-cleanup.yml.template # PATH: /templates/workflows/shared/repository-cleanup.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: Recurring repository maintenance — labels, branches, workflows, logs, doc indexes # BRIEF: Recurring repository maintenance — labels, branches, workflows, logs, doc indexes
# NOTE: Synced via bulk-repo-sync to .github/workflows/repository-cleanup.yml in all governed repos. # NOTE: Synced via bulk-repo-sync to .github/workflows/repository-cleanup.yml in all governed repos.
# Runs on the 1st and 15th of each month at 6:00 AM UTC, and on manual dispatch. # Runs on the 1st and 15th of each month at 6:00 AM UTC, and on manual dispatch.

View File

@@ -5,7 +5,7 @@
# INGROUP: MokoStandards.Compliance # INGROUP: MokoStandards.Compliance
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /.github/workflows/standards-compliance.yml # PATH: /.github/workflows/standards-compliance.yml
# VERSION: 04.05.00 # VERSION: 04.06.00
# BRIEF: MokoStandards compliance validation workflow # BRIEF: MokoStandards compliance validation workflow
# NOTE: Validates repository structure, documentation, and coding standards # NOTE: Validates repository structure, documentation, and coding standards

View File

@@ -9,7 +9,7 @@
# INGROUP: MokoStandards.Automation # INGROUP: MokoStandards.Automation
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/shared/sync-version-on-merge.yml.template # PATH: /templates/workflows/shared/sync-version-on-merge.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: Auto-bump patch version on every push to main and propagate to all file headers # BRIEF: Auto-bump patch version on every push to main and propagate to all file headers
# NOTE: Synced via bulk-repo-sync to .github/workflows/sync-version-on-merge.yml in all governed repos. # NOTE: Synced via bulk-repo-sync to .github/workflows/sync-version-on-merge.yml in all governed repos.
# README.md is the single source of truth for the repository version. # README.md is the single source of truth for the repository version.

View File

@@ -7,7 +7,7 @@
# INGROUP: MokoStandards.Joomla # INGROUP: MokoStandards.Joomla
# REPO: https://github.com/mokoconsulting-tech/MokoStandards # REPO: https://github.com/mokoconsulting-tech/MokoStandards
# PATH: /templates/workflows/joomla/update-server.yml.template # PATH: /templates/workflows/joomla/update-server.yml.template
# VERSION: 04.05.13 # VERSION: 04.06.00
# BRIEF: Update Joomla update server XML feed with stable/rc/dev entries # BRIEF: Update Joomla update server XML feed with stable/rc/dev entries
# #
# Writes updates.xml with multiple <update> entries: # Writes updates.xml with multiple <update> entries:
@@ -23,6 +23,8 @@ on:
push: push:
branches: branches:
- 'dev/**' - 'dev/**'
- 'alpha/**'
- 'beta/**'
- 'rc/**' - 'rc/**'
paths: paths:
- 'src/**' - 'src/**'
@@ -30,12 +32,14 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
stability: stability:
description: 'Stability tag (development, rc, stable)' description: 'Stability tag'
required: true required: true
default: 'development' default: 'development'
type: choice type: choice
options: options:
- development - development
- alpha
- beta
- rc - rc
- stable - stable
@@ -80,6 +84,10 @@ jobs:
STABILITY="${{ inputs.stability }}" STABILITY="${{ inputs.stability }}"
elif [[ "$BRANCH" == rc/* ]]; then elif [[ "$BRANCH" == rc/* ]]; then
STABILITY="rc" STABILITY="rc"
elif [[ "$BRANCH" == beta/* ]]; then
STABILITY="beta"
elif [[ "$BRANCH" == alpha/* ]]; then
STABILITY="alpha"
elif [[ "$BRANCH" == dev/* ]]; then elif [[ "$BRANCH" == dev/* ]]; then
STABILITY="development" STABILITY="development"
else else
@@ -116,19 +124,23 @@ jobs:
# Version suffix for non-stable # Version suffix for non-stable
DISPLAY_VERSION="$VERSION" DISPLAY_VERSION="$VERSION"
[ "$STABILITY" = "rc" ] && DISPLAY_VERSION="${VERSION}-rc" case "$STABILITY" in
[ "$STABILITY" = "development" ] && DISPLAY_VERSION="${VERSION}-dev" development) DISPLAY_VERSION="${VERSION}-dev" ;;
alpha) DISPLAY_VERSION="${VERSION}-alpha" ;;
beta) DISPLAY_VERSION="${VERSION}-beta" ;;
rc) DISPLAY_VERSION="${VERSION}-rc" ;;
esac
MAJOR=$(echo "$VERSION" | awk -F. '{print $1}') MAJOR=$(echo "$VERSION" | awk -F. '{print $1}')
# Each stability level has its own release tag # Each stability level has its own release tag
if [ "$STABILITY" = "rc" ]; then case "$STABILITY" in
RELEASE_TAG="release-candidate" development) RELEASE_TAG="development" ;;
elif [ "$STABILITY" = "development" ]; then alpha) RELEASE_TAG="alpha" ;;
RELEASE_TAG="development" beta) RELEASE_TAG="beta" ;;
else rc) RELEASE_TAG="release-candidate" ;;
RELEASE_TAG="v${MAJOR}" *) RELEASE_TAG="v${MAJOR}" ;;
fi esac
PACKAGE_NAME="${EXT_ELEMENT}-${DISPLAY_VERSION}.zip" PACKAGE_NAME="${EXT_ELEMENT}-${DISPLAY_VERSION}.zip"
DOWNLOAD_URL="https://github.com/${REPO}/releases/download/${RELEASE_TAG}/${PACKAGE_NAME}" DOWNLOAD_URL="https://github.com/${REPO}/releases/download/${RELEASE_TAG}/${PACKAGE_NAME}"
@@ -157,95 +169,63 @@ jobs:
fi fi
# ── Build the new entry ─────────────────────────────────────── # ── Build the new entry ───────────────────────────────────────
NEW_ENTRY=$(cat <<XMLEOF NEW_ENTRY=""
<update> NEW_ENTRY="${NEW_ENTRY} <update>\n"
<name>${EXT_NAME}</name> NEW_ENTRY="${NEW_ENTRY} <name>${EXT_NAME}</name>\n"
<description>${EXT_NAME} (${STABILITY})</description> NEW_ENTRY="${NEW_ENTRY} <description>${EXT_NAME} (${STABILITY})</description>\n"
<element>${EXT_ELEMENT}</element> NEW_ENTRY="${NEW_ENTRY} <element>${EXT_ELEMENT}</element>\n"
<type>${EXT_TYPE}</type> NEW_ENTRY="${NEW_ENTRY} <type>${EXT_TYPE}</type>\n"
<version>${DISPLAY_VERSION}</version> NEW_ENTRY="${NEW_ENTRY} <version>${DISPLAY_VERSION}</version>\n"
$([ -n "$CLIENT_TAG" ] && echo " ${CLIENT_TAG}") [ -n "$CLIENT_TAG" ] && NEW_ENTRY="${NEW_ENTRY} ${CLIENT_TAG}\n"
$([ -n "$FOLDER_TAG" ] && echo " ${FOLDER_TAG}") [ -n "$FOLDER_TAG" ] && NEW_ENTRY="${NEW_ENTRY} ${FOLDER_TAG}\n"
<tags> NEW_ENTRY="${NEW_ENTRY} <tags>\n"
<tag>${STABILITY}</tag> NEW_ENTRY="${NEW_ENTRY} <tag>${STABILITY}</tag>\n"
</tags> NEW_ENTRY="${NEW_ENTRY} </tags>\n"
<infourl title="${EXT_NAME}">${INFO_URL}</infourl> NEW_ENTRY="${NEW_ENTRY} <infourl title=\"${EXT_NAME}\">${INFO_URL}</infourl>\n"
<downloads> NEW_ENTRY="${NEW_ENTRY} <downloads>\n"
<downloadurl type="full" format="zip">${DOWNLOAD_URL}</downloadurl> NEW_ENTRY="${NEW_ENTRY} <downloadurl type=\"full\" format=\"zip\">${DOWNLOAD_URL}</downloadurl>\n"
</downloads> NEW_ENTRY="${NEW_ENTRY} </downloads>\n"
$([ -n "$SHA256" ] && echo " <sha256>sha256:${SHA256}</sha256>") [ -n "$SHA256" ] && NEW_ENTRY="${NEW_ENTRY} <sha256>sha256:${SHA256}</sha256>\n"
${TARGET_PLATFORM} NEW_ENTRY="${NEW_ENTRY} ${TARGET_PLATFORM}\n"
$([ -n "$PHP_TAG" ] && echo " ${PHP_TAG}") [ -n "$PHP_TAG" ] && NEW_ENTRY="${NEW_ENTRY} ${PHP_TAG}\n"
<maintainer>Moko Consulting</maintainer> NEW_ENTRY="${NEW_ENTRY} <maintainer>Moko Consulting</maintainer>\n"
<maintainerurl>https://mokoconsulting.tech</maintainerurl> NEW_ENTRY="${NEW_ENTRY} <maintainerurl>https://mokoconsulting.tech</maintainerurl>\n"
</update> NEW_ENTRY="${NEW_ENTRY} </update>"
XMLEOF
) # ── Write new entry to temp file ───────────────────────────────
printf '%b' "$NEW_ENTRY" > /tmp/new_entry.xml
# ── Merge into updates.xml ───────────────────────────────────── # ── Merge into updates.xml ─────────────────────────────────────
if [ ! -f "updates.xml" ]; then if [ ! -f "updates.xml" ]; then
# Create fresh
printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>' > updates.xml printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>' > updates.xml
printf '%s\n' '<updates>' >> updates.xml printf '%s\n' '<updates>' >> updates.xml
echo "$NEW_ENTRY" >> updates.xml cat /tmp/new_entry.xml >> updates.xml
printf '%s\n' '</updates>' >> updates.xml printf '\n%s\n' '</updates>' >> updates.xml
else else
# Remove existing entry for this stability, add new one # Remove existing entry for this stability, insert new one
# Use python for reliable XML manipulation printf 'import re\nstability = "%s"\n' "${STABILITY}" > /tmp/merge_xml.py
python3 -c " printf 'with open("updates.xml") as f: content = f.read()\n' >> /tmp/merge_xml.py
import re, sys printf 'with open("/tmp/new_entry.xml") as f: new_entry = f.read()\n' >> /tmp/merge_xml.py
printf 'pattern = r" <update>.*?<tag>" + re.escape(stability) + r"</tag>.*?</update>\\n?"\n' >> /tmp/merge_xml.py
with open('updates.xml', 'r') as f: printf 'content = re.sub(pattern, "", content, flags=re.DOTALL)\n' >> /tmp/merge_xml.py
content = f.read() printf 'content = content.replace("</updates>", new_entry + "\\n</updates>")\n' >> /tmp/merge_xml.py
printf 'content = re.sub(r"\\n{3,}", "\\n\\n", content)\n' >> /tmp/merge_xml.py
# Remove existing entry with this stability tag printf 'with open("updates.xml", "w") as f: f.write(content)\n' >> /tmp/merge_xml.py
pattern = r' <update>.*?<tag>${STABILITY}</tag>.*?</update>\n?' python3 /tmp/merge_xml.py 2>/dev/null || {
content = re.sub(pattern, '', content, flags=re.DOTALL) # Fallback: rebuild keeping other stability entries
# Insert new entry before </updates>
new_entry = '''${NEW_ENTRY}'''
content = content.replace('</updates>', new_entry + '\n</updates>')
# Clean up empty lines
content = re.sub(r'\n{3,}', '\n\n', content)
with open('updates.xml', 'w') as f:
f.write(content)
" 2>/dev/null || {
# Fallback: just rewrite the whole file if python fails
# Keep existing stable entry if present
STABLE_ENTRY=""
if [ "$STABILITY" != "stable" ] && grep -q '<tag>stable</tag>' updates.xml; then
STABLE_ENTRY=$(sed -n '/<update>/,/<\/update>/{ /<tag>stable<\/tag>/,/<\/update>/p; /<update>/,/<tag>stable<\/tag>/p }' updates.xml | sort -u)
fi
RC_ENTRY=""
if [ "$STABILITY" != "rc" ] && grep -q '<tag>rc</tag>' updates.xml; then
RC_ENTRY=$(python3 -c "
import re
with open('updates.xml') as f: c = f.read()
m = re.search(r'(<update>.*?<tag>rc</tag>.*?</update>)', c, re.DOTALL)
if m: print(m.group(1))
" 2>/dev/null || true)
fi
DEV_ENTRY=""
if [ "$STABILITY" != "development" ] && grep -q '<tag>development</tag>' updates.xml; then
DEV_ENTRY=$(python3 -c "
import re
with open('updates.xml') as f: c = f.read()
m = re.search(r'(<update>.*?<tag>development</tag>.*?</update>)', c, re.DOTALL)
if m: print(m.group(1))
" 2>/dev/null || true)
fi
{ {
printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>' printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>'
printf '%s\n' '<updates>' printf '%s\n' '<updates>'
[ -n "$STABLE_ENTRY" ] && echo "$STABLE_ENTRY" for TAG in stable rc development; do
[ -n "$RC_ENTRY" ] && echo "$RC_ENTRY" [ "$TAG" = "${STABILITY}" ] && continue
[ -n "$DEV_ENTRY" ] && echo "$DEV_ENTRY" if grep -q "<tag>${TAG}</tag>" updates.xml 2>/dev/null; then
echo "$NEW_ENTRY" sed -n "/<update>/,/<\/update>/{ /<tag>${TAG}<\/tag>/p; }" updates.xml
printf '%s\n' '</updates>' fi
} > updates.xml done
cat /tmp/new_entry.xml
printf '\n%s\n' '</updates>'
} > /tmp/updates_new.xml
mv /tmp/updates_new.xml updates.xml
} }
fi fi