From c00dc21c291bf5d990a53d622ac4bc38a84182d7 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 30 Jun 2026 13:23:39 -0500 Subject: [PATCH 1/2] chore: cleanup workflows on main, add manual dispatch to pre-release - Remove old build.yaml (hardcoded, references updates.xml) - Remove duplicate build-release.yml - Add pre-release.yml with workflow_dispatch for manual triggering --- .gitea/workflows/build.yaml | 33 ---------------- .gitea/workflows/pre-release.yml | 66 ++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 33 deletions(-) delete mode 100644 .gitea/workflows/build.yaml create mode 100644 .gitea/workflows/pre-release.yml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml deleted file mode 100644 index 10f5bf5..0000000 --- a/.gitea/workflows/build.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build Package -on: - push: - tags: - - 'v*' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Build package ZIP - run: | - cd source - # Create individual package ZIPs - for pkg_dir in packages/*/; do - pkg_name=$(basename "$pkg_dir") - cd "$pkg_dir" - zip -r "../../${pkg_name}.zip" . -x "*.git*" - cd ../.. - done - # Create main package ZIP with all sub-packages + manifest - zip -j "pkg_mokosuitefield.zip" pkg_*.xml script.php updates.xml *.zip 2>/dev/null || true - ls -la *.zip - - - name: Create Release - uses: softprops/action-gh-release@v1 - with: - files: source/pkg_mokosuitefield.zip - generate_release_notes: true diff --git a/.gitea/workflows/pre-release.yml b/.gitea/workflows/pre-release.yml new file mode 100644 index 0000000..7e4d40e --- /dev/null +++ b/.gitea/workflows/pre-release.yml @@ -0,0 +1,66 @@ +name: Pre-Release Package + +on: + push: + tags: + - "v*" + workflow_dispatch: + inputs: + version: + description: "Version (e.g. 1.0.0-alpha.1)" + required: true + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Determine version + id: version + run: | + if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then + echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT + echo "TAG=v${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT + else + VERSION="${GITHUB_REF#refs/tags/v}" + echo "VERSION=$VERSION" >> $GITHUB_OUTPUT + echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT + fi + + - name: Build package zip + run: | + cd source + for dir in packages/*/; do + pkg_name=$(basename "$dir") + cd "$dir" + zip -r "../../${pkg_name}.zip" . -x "*.git*" + cd ../.. + done + mkdir -p pkg_build + mv *.zip pkg_build/ + cp pkg_*.xml pkg_build/ 2>/dev/null || true + cp script.php pkg_build/ 2>/dev/null || true + cd pkg_build + zip -r "../${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip" . + + - name: Create Pre-Release + uses: actions/create-release@v1 + id: create_release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.version.outputs.TAG }} + release_name: "${{ github.event.repository.name }} ${{ steps.version.outputs.TAG }}" + draft: false + prerelease: true + + - name: Upload Release Asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./source/${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip + asset_name: ${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip + asset_content_type: application/zip -- 2.52.0 From 60c11ab18bc2daa48a0d2c2a33c73878b4ebc142 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 30 Jun 2026 18:24:47 +0000 Subject: [PATCH 2/2] chore(version): pre-release bump to 06.00.18-dev [skip ci] --- .mokogitea/workflows/issue-branch.yml | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- SECURITY.md | 2 +- packages/MokoSuiteCRM | 2 +- packages/MokoSuiteClient | 2 +- source/pkg_mokosuitefield.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 11958bd..fea5520 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: mokocli.Automation -# VERSION: 01.00.00 +# VERSION: 06.00.18 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 809e983..72ce0eb 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Template-Joomla INGROUP: Template-Joomla.Documentation REPO: https://github.com/mokoconsulting-tech/Template-Joomla/ - VERSION: 01.01.00 + VERSION: 06.00.18 PATH: ./CODE_OF_CONDUCT.md BRIEF: Community expectations and enforcement guidelines NOTE: Adapted with attribution from the Contributor Covenant v2.1 diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 47fa254..85c1a61 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.Template-Joomla INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/Template-Joomla - VERSION: 01.01.00 + VERSION: 06.00.18 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for Template-Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 86b35ed..9ca5ddc 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla INGROUP: Template-Joomla.Documentation REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla PATH: /SECURITY.md -VERSION: 01.01.00 +VERSION: 06.00.18 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/packages/MokoSuiteCRM b/packages/MokoSuiteCRM index 6c78af1..01d6015 160000 --- a/packages/MokoSuiteCRM +++ b/packages/MokoSuiteCRM @@ -1 +1 @@ -Subproject commit 6c78af16e6cd0f31f953f90701c403d60d8db766 +Subproject commit 01d601528cc921a75abc7ebedb6b0edd0a1a5c43 diff --git a/packages/MokoSuiteClient b/packages/MokoSuiteClient index 6cd16d9..0a9125e 160000 --- a/packages/MokoSuiteClient +++ b/packages/MokoSuiteClient @@ -1 +1 @@ -Subproject commit 6cd16d984589fabbfd0b074b0d3308b5e64967f0 +Subproject commit 0a9125e51956a084941abccdf2de8ddd064777e8 diff --git a/source/pkg_mokosuitefield.xml b/source/pkg_mokosuitefield.xml index de66a2c..e10a838 100644 --- a/source/pkg_mokosuitefield.xml +++ b/source/pkg_mokosuitefield.xml @@ -2,7 +2,7 @@ Package - MokoSuite Field mokosuitefield - 01.08.00 + 06.00.18 2026-06-12 Moko Consulting hello@mokoconsulting.tech -- 2.52.0