Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f341c086a2 | |||
| 36cc6ee4b2 | |||
| 07c80b8e5d | |||
| 09bc1c96b0 | |||
| 96ae9d9fc7 | |||
| 4ba500f6d5 |
@@ -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
|
|
||||||
@@ -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
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
# FILE INFORMATION
|
# FILE INFORMATION
|
||||||
# DEFGROUP: Gitea.Workflow
|
# DEFGROUP: Gitea.Workflow
|
||||||
# INGROUP: mokocli.Automation
|
# INGROUP: mokocli.Automation
|
||||||
# VERSION: 06.00.14
|
# VERSION: 06.00.19
|
||||||
# BRIEF: Auto-create feature branch when an issue is opened
|
# BRIEF: Auto-create feature branch when an issue is opened
|
||||||
|
|
||||||
name: "Universal: Issue Branch"
|
name: "Universal: Issue Branch"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<creationDate>2026-06-27</creationDate>
|
<creationDate>2026-06-27</creationDate>
|
||||||
<copyright>Copyright (C) 2026 Moko Consulting.</copyright>
|
<copyright>Copyright (C) 2026 Moko Consulting.</copyright>
|
||||||
<license>GPL-3.0-or-later</license>
|
<license>GPL-3.0-or-later</license>
|
||||||
<version>06.00.14</version>
|
<version>06.00.19</version>
|
||||||
<namespace path="src">Moko\Component\MokoSuiteField</namespace>
|
<namespace path="src">Moko\Component\MokoSuiteField</namespace>
|
||||||
<administration>
|
<administration>
|
||||||
<files folder="admin"><folder>services</folder><folder>src</folder><folder>tmpl</folder></files>
|
<files folder="admin"><folder>services</folder><folder>src</folder><folder>tmpl</folder></files>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<license>GPL-3.0-or-later</license>
|
<license>GPL-3.0-or-later</license>
|
||||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||||
<authorUrl>https://mokoconsulting.tech</authorUrl>
|
<authorUrl>https://mokoconsulting.tech</authorUrl>
|
||||||
<version>06.00.14</version>
|
<version>06.00.19</version>
|
||||||
<php_minimum>8.3</php_minimum>
|
<php_minimum>8.3</php_minimum>
|
||||||
<description>PLG_SYSTEM_MOKOSUITEFIELD_DESC</description>
|
<description>PLG_SYSTEM_MOKOSUITEFIELD_DESC</description>
|
||||||
<namespace path="src">Moko\Plugin\System\MokoSuiteField</namespace>
|
<namespace path="src">Moko\Plugin\System\MokoSuiteField</namespace>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<name>Web Services - MokoSuite Field</name>
|
<name>Web Services - MokoSuite Field</name>
|
||||||
<element>mokosuitefield</element>
|
<element>mokosuitefield</element>
|
||||||
<author>Moko Consulting</author>
|
<author>Moko Consulting</author>
|
||||||
<version>06.00.14</version>
|
<version>06.00.19</version>
|
||||||
<license>GPL-3.0-or-later</license>
|
<license>GPL-3.0-or-later</license>
|
||||||
<namespace path="src">Moko\Plugin\WebServices\MokoSuiteField</namespace>
|
<namespace path="src">Moko\Plugin\WebServices\MokoSuiteField</namespace>
|
||||||
<files><folder>src</folder><folder>services</folder></files>
|
<files><folder>src</folder><folder>services</folder></files>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<extension type="package" method="upgrade">
|
<extension type="package" method="upgrade">
|
||||||
<name>Package - MokoSuite Field</name>
|
<name>Package - MokoSuite Field</name>
|
||||||
<packagename>mokosuitefield</packagename>
|
<packagename>mokosuitefield</packagename>
|
||||||
<version>06.00.14</version>
|
<version>06.00.19</version>
|
||||||
<creationDate>2026-06-27</creationDate>
|
<creationDate>2026-06-27</creationDate>
|
||||||
<author>Moko Consulting</author>
|
<author>Moko Consulting</author>
|
||||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||||
|
|||||||
+171
-5
@@ -1,9 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* @package MokoSuiteField
|
* MokoSuite Field Package Install Script
|
||||||
* @subpackage pkg_mokosuitefield
|
*
|
||||||
|
* @package MokoSuite Field
|
||||||
* @copyright Copyright (C) 2026 Moko Consulting. All rights reserved.
|
* @copyright Copyright (C) 2026 Moko Consulting. All rights reserved.
|
||||||
* @license GNU General Public License version 3 or later; see LICENSE
|
* @license GPL-3.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
defined('_JEXEC') or die;
|
defined('_JEXEC') or die;
|
||||||
@@ -11,19 +12,185 @@ defined('_JEXEC') or die;
|
|||||||
use Joomla\CMS\Factory;
|
use Joomla\CMS\Factory;
|
||||||
use Joomla\CMS\Installer\InstallerAdapter;
|
use Joomla\CMS\Installer\InstallerAdapter;
|
||||||
use Joomla\CMS\Log\Log;
|
use Joomla\CMS\Log\Log;
|
||||||
|
use Joomla\Database\DatabaseInterface;
|
||||||
|
|
||||||
class Pkg_MokoSuiteFieldInstallerScript
|
class Pkg_MokoSuiteFieldInstallerScript
|
||||||
{
|
{
|
||||||
|
private string $savedDlid = '';
|
||||||
|
|
||||||
|
public function preflight(string $type, InstallerAdapter $adapter): bool
|
||||||
|
{
|
||||||
|
if ($type === 'update')
|
||||||
|
{
|
||||||
|
$this->savedDlid = $this->getExistingDlid();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public function postflight(string $type, InstallerAdapter $adapter): void
|
public function postflight(string $type, InstallerAdapter $adapter): void
|
||||||
{
|
{
|
||||||
|
if ($this->savedDlid)
|
||||||
|
{
|
||||||
|
$this->restoreDlid($this->savedDlid);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($type === 'install')
|
||||||
|
{
|
||||||
|
$missing = $this->verifyChildren($adapter);
|
||||||
|
|
||||||
|
if (!empty($missing))
|
||||||
|
{
|
||||||
|
Factory::getApplication()->enqueueMessage(
|
||||||
|
'<strong>MokoSuite Field — Incomplete Installation</strong><br>'
|
||||||
|
. 'The following extensions failed to install: '
|
||||||
|
. implode(', ', $missing)
|
||||||
|
. '.<br>Please check file permissions and server logs, then reinstall the package.',
|
||||||
|
'error'
|
||||||
|
);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->enablePlugin('system', 'mokosuitefield');
|
||||||
|
$this->enablePlugin('webservices', 'mokosuitefield');
|
||||||
|
}
|
||||||
|
|
||||||
$this->warnMissingLicenseKey();
|
$this->warnMissingLicenseKey();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function verifyChildren(InstallerAdapter $adapter): array
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$manifest = $adapter->getParent()->getManifest();
|
||||||
|
$files = $manifest->files->file ?? [];
|
||||||
|
|
||||||
|
if (!$files)
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = Factory::getContainer()->get(DatabaseInterface::class);
|
||||||
|
$missing = [];
|
||||||
|
|
||||||
|
foreach ($files as $file)
|
||||||
|
{
|
||||||
|
$type = (string) ($file['type'] ?? '');
|
||||||
|
$id = (string) ($file['id'] ?? '');
|
||||||
|
$group = (string) ($file['group'] ?? '');
|
||||||
|
|
||||||
|
if ($type === '' || $id === '')
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$element = ($type === 'plugin' && $group !== '')
|
||||||
|
? preg_replace('/^plg_' . preg_quote($group, '/') . '_/', '', $id)
|
||||||
|
: $id;
|
||||||
|
|
||||||
|
$query = $db->getQuery(true)
|
||||||
|
->select('COUNT(*)')
|
||||||
|
->from($db->quoteName('#__extensions'))
|
||||||
|
->where($db->quoteName('element') . ' = ' . $db->quote($element))
|
||||||
|
->where($db->quoteName('type') . ' = ' . $db->quote($type));
|
||||||
|
|
||||||
|
if ($type === 'plugin' && $group !== '')
|
||||||
|
{
|
||||||
|
$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
|
||||||
|
}
|
||||||
|
|
||||||
|
$db->setQuery($query);
|
||||||
|
|
||||||
|
if ((int) $db->loadResult() === 0)
|
||||||
|
{
|
||||||
|
$missing[] = htmlspecialchars($type . ': ' . $id, ENT_QUOTES, 'UTF-8');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $missing;
|
||||||
|
}
|
||||||
|
catch (\Throwable $e)
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getExistingDlid(): string
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$db = Factory::getContainer()->get(DatabaseInterface::class);
|
||||||
|
$db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->select($db->quoteName('extra_query'))
|
||||||
|
->from($db->quoteName('#__update_sites'))
|
||||||
|
->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteField%')
|
||||||
|
. ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoSuiteField%') . ')')
|
||||||
|
->setLimit(1)
|
||||||
|
);
|
||||||
|
|
||||||
|
$extraQuery = $db->loadResult() ?? '';
|
||||||
|
|
||||||
|
if (preg_match('/dlid=([a-zA-Z0-9]+)/', $extraQuery, $matches))
|
||||||
|
{
|
||||||
|
return $matches[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (\Throwable $e)
|
||||||
|
{
|
||||||
|
Log::add('Field install: failed to read DLID — ' . $e->getMessage(), Log::WARNING, 'mokosuite.field');
|
||||||
|
}
|
||||||
|
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
private function restoreDlid(string $dlid): void
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$db = Factory::getContainer()->get(DatabaseInterface::class);
|
||||||
|
$db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->update($db->quoteName('#__update_sites'))
|
||||||
|
->set($db->quoteName('extra_query') . ' = ' . $db->quote('dlid=' . $dlid))
|
||||||
|
->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteField%')
|
||||||
|
. ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoSuiteField%') . ')')
|
||||||
|
);
|
||||||
|
$db->execute();
|
||||||
|
}
|
||||||
|
catch (\Throwable $e)
|
||||||
|
{
|
||||||
|
Log::add('Field install: failed to restore DLID — ' . $e->getMessage(), Log::WARNING, 'mokosuite.field');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function enablePlugin(string $group, string $element): void
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$db = Factory::getContainer()->get(DatabaseInterface::class);
|
||||||
|
$db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->update($db->quoteName('#__extensions'))
|
||||||
|
->set($db->quoteName('enabled') . ' = 1')
|
||||||
|
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
|
||||||
|
->where($db->quoteName('folder') . ' = ' . $db->quote($group))
|
||||||
|
->where($db->quoteName('element') . ' = ' . $db->quote($element))
|
||||||
|
);
|
||||||
|
$db->execute();
|
||||||
|
}
|
||||||
|
catch (\Throwable $e)
|
||||||
|
{
|
||||||
|
Log::add('Field install: failed to enable ' . $group . '/' . $element . ' — ' . $e->getMessage(), Log::WARNING, 'mokosuite.field');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function warnMissingLicenseKey(): void
|
private function warnMissingLicenseKey(): void
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
$db = Factory::getDbo();
|
$db = Factory::getContainer()->get(DatabaseInterface::class);
|
||||||
$app = Factory::getApplication();
|
$app = Factory::getApplication();
|
||||||
|
|
||||||
$query = $db->getQuery(true)
|
$query = $db->getQuery(true)
|
||||||
@@ -65,7 +232,6 @@ class Pkg_MokoSuiteFieldInstallerScript
|
|||||||
}
|
}
|
||||||
catch (\Throwable $e)
|
catch (\Throwable $e)
|
||||||
{
|
{
|
||||||
// Silent — avoid breaking install if update_sites query fails
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user