From 4ba500f6d56c859637049e1ecf0e1645905cc100 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 30 Jun 2026 13:15:00 -0500 Subject: [PATCH 1/2] chore: cleanup workflows, 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 - All releases marked as pre-release until stable testing complete --- .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 96ae9d9fc7d732bde5c2565b5aaa394176661223 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 30 Jun 2026 18:15:13 +0000 Subject: [PATCH 2/2] chore(version): pre-release bump to 06.00.15-dev [skip ci] --- .mokogitea/workflows/issue-branch.yml | 2 +- source/packages/com_mokosuitefield/mokosuitefield.xml | 2 +- source/packages/plg_system_mokosuitefield/mokosuitefield.xml | 2 +- .../packages/plg_webservices_mokosuitefield/mokosuitefield.xml | 2 +- source/pkg_mokosuitefield.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 1904498..65c7ace 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: 06.00.14 +# VERSION: 06.00.15 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/source/packages/com_mokosuitefield/mokosuitefield.xml b/source/packages/com_mokosuitefield/mokosuitefield.xml index 2fd8bbb..edbda75 100644 --- a/source/packages/com_mokosuitefield/mokosuitefield.xml +++ b/source/packages/com_mokosuitefield/mokosuitefield.xml @@ -5,7 +5,7 @@ 2026-06-27 Copyright (C) 2026 Moko Consulting. GPL-3.0-or-later - 06.00.14 + 06.00.15 Moko\Component\MokoSuiteField servicessrctmpl diff --git a/source/packages/plg_system_mokosuitefield/mokosuitefield.xml b/source/packages/plg_system_mokosuitefield/mokosuitefield.xml index e61dfb0..1da5f18 100644 --- a/source/packages/plg_system_mokosuitefield/mokosuitefield.xml +++ b/source/packages/plg_system_mokosuitefield/mokosuitefield.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 06.00.14 + 06.00.15 8.3 PLG_SYSTEM_MOKOSUITEFIELD_DESC Moko\Plugin\System\MokoSuiteField diff --git a/source/packages/plg_webservices_mokosuitefield/mokosuitefield.xml b/source/packages/plg_webservices_mokosuitefield/mokosuitefield.xml index 0089817..d352ce9 100644 --- a/source/packages/plg_webservices_mokosuitefield/mokosuitefield.xml +++ b/source/packages/plg_webservices_mokosuitefield/mokosuitefield.xml @@ -3,7 +3,7 @@ Web Services - MokoSuite Field mokosuitefield Moko Consulting - 06.00.14 + 06.00.15 GPL-3.0-or-later Moko\Plugin\WebServices\MokoSuiteField srcservices diff --git a/source/pkg_mokosuitefield.xml b/source/pkg_mokosuitefield.xml index 539374f..07f4639 100644 --- a/source/pkg_mokosuitefield.xml +++ b/source/pkg_mokosuitefield.xml @@ -2,7 +2,7 @@ Package - MokoSuite Field mokosuitefield - 06.00.14 + 06.00.15 2026-06-27 Moko Consulting hello@mokoconsulting.tech -- 2.52.0