Public Access
b491241a58
Universal: Sync Feature Branch Versions / Sync feature branches with dev (push) Has been skipped
# Conflicts: # .mokogitea/CLAUDE.md # .mokogitea/ISSUE_TEMPLATE/config.yml # .mokogitea/ISSUE_TEMPLATE/documentation.md # .mokogitea/ISSUE_TEMPLATE/feature_request.md # .mokogitea/ISSUE_TEMPLATE/security.md # .mokogitea/branch-protection.yml # .mokogitea/bulk-repo-sync.yml # .mokogitea/pr-branch-check.yml # .mokogitea/renovate.yml # .mokogitea/sync-wikis.yml # .mokogitea/workflows/auto-bump.yml # .mokogitea/workflows/auto-release.yml # .mokogitea/workflows/ci-platform.yml # .mokogitea/workflows/cleanup.yml # .mokogitea/workflows/gitleaks.yml # .mokogitea/workflows/issue-branch.yml # .mokogitea/workflows/notify.yml # .mokogitea/workflows/pre-release.yml # .mokogitea/workflows/repo-health.yml # .mokogitea/workflows/security-audit.yml # .script-registry.json # CHANGELOG.md # PLUGIN_SCRIPTS.md # README.md # analysis/index.md # automation/bulk_joomla_template.php # automation/bulk_sync.php # automation/enrich_manifest_xml.php # automation/enrich_mokostandards_xml.php # automation/index.md # automation/migrate_to_gitea.php # automation/push_files.php # automation/push_manifest_xml.php # automation/push_mokostandards_xml.php # automation/repo_cleanup.php # bin/moko # cli/archive_repo.php # cli/audit_query.php # cli/badge_update.php # cli/branch_rename.php # cli/bulk_workflow_push.php # cli/bulk_workflow_trigger.php # cli/changelog_promote.php # cli/changelog_prune.php # cli/client_dashboard.php # cli/client_health_check.php # cli/client_inventory.php # cli/client_provision.php # cli/completion.php # cli/create_project.php # cli/create_repo.php # cli/deploy_joomla.php # cli/dev_branch_reset.php # cli/grafana_dashboard.php # cli/joomla_build.php # cli/joomla_compat_check.php # cli/joomla_metadata_validate.php # cli/joomla_release.php # cli/license_manage.php # cli/manifest_element.php # cli/manifest_licensing.php # cli/manifest_read.php # cli/package_build.php # cli/platform_detect.php # cli/release.php # cli/release_body_update.php # cli/release_cascade.php # cli/release_create.php # cli/release_manage.php # cli/release_mirror.php # cli/release_notes.php # cli/release_package.php # cli/release_promote.php # cli/release_publish.php # cli/release_validate.php # cli/release_verify.php # cli/scaffold_client.php # cli/sync_rulesets.php # cli/theme_lint.php # cli/updates_xml_build.php # cli/updates_xml_sync.php # cli/version_auto_bump.php # cli/version_bump.php # cli/version_bump_remote.php # cli/version_check.php # cli/version_read.php # cli/version_reset_dev.php # cli/version_set_platform.php # cli/wiki_sync.php # cli/workflow_sync.php # composer.json # deploy/backup-before-deploy.php # deploy/deploy-dolibarr.php # deploy/deploy-joomla.php # deploy/deploy-sftp.php # deploy/health-check.php # deploy/rollback-joomla.php # deploy/sync-joomla.php # fix/fix_line_endings.php # fix/fix_permissions.php # fix/fix_tabs.php # fix/fix_trailing_spaces.php # fix/index.md # index.md # lib/CliBase.php # lib/Common.php # lib/Enterprise/AbstractProjectPlugin.php # lib/Enterprise/ApiClient.php # lib/Enterprise/AuditLogger.php # lib/Enterprise/CheckpointManager.php # lib/Enterprise/CliFramework.php # lib/Enterprise/Config.php # lib/Enterprise/ConfigValidator.php # lib/Enterprise/EnterpriseReadinessValidator.php # lib/Enterprise/ErrorRecovery.php # lib/Enterprise/FileFixUtility.php # lib/Enterprise/GitHubAdapter.php # lib/Enterprise/GitPlatformAdapter.php # lib/Enterprise/InputValidator.php # lib/Enterprise/ManifestParser.php # lib/Enterprise/ManifestReader.php # lib/Enterprise/MetricsCollector.php # lib/Enterprise/MokoGiteaAdapter.php # lib/Enterprise/PackageBuilder.php # lib/Enterprise/PlatformAdapterFactory.php # lib/Enterprise/PluginFactory.php # lib/Enterprise/PluginRegistry.php # lib/Enterprise/Plugins/ApiPlugin.php # lib/Enterprise/Plugins/DocumentationPlugin.php # lib/Enterprise/Plugins/DolibarrPlugin.php # lib/Enterprise/Plugins/GenericPlugin.php # lib/Enterprise/Plugins/JoomlaPlugin.php # lib/Enterprise/Plugins/McpServerPlugin.php # lib/Enterprise/Plugins/MobilePlugin.php # lib/Enterprise/Plugins/NodeJsPlugin.php # lib/Enterprise/Plugins/PythonPlugin.php # lib/Enterprise/Plugins/TerraformPlugin.php # lib/Enterprise/Plugins/WordPressPlugin.php # lib/Enterprise/ProjectConfigValidator.php # lib/Enterprise/ProjectMetricsCollector.php # lib/Enterprise/ProjectPluginInterface.php # lib/Enterprise/ProjectTypeDetector.php # lib/Enterprise/RecoveryError.php # lib/Enterprise/RecoveryManager.php # lib/Enterprise/RepositoryHealthChecker.php # lib/Enterprise/RepositorySynchronizer.php # lib/Enterprise/RetryHelper.php # lib/Enterprise/SecurityValidator.php # lib/Enterprise/SourceResolver.php # lib/Enterprise/SynchronizationException.php # lib/Enterprise/TransactionManager.php # lib/Enterprise/UnifiedValidation.php # lib/index.md # lib/plugins/Joomla/UpdateXmlGenerator.php # maintenance/index.md # maintenance/pin_action_shas.php # maintenance/repo_inventory.php # maintenance/rotate_secrets.php # maintenance/setup_labels.php # maintenance/sync_dolibarr_readmes.php # maintenance/update_repo_inventory.php # maintenance/update_sha_hashes.php # maintenance/update_version_from_readme.php # mcp/config.example.json # mcp/package.json # mcp/src/config.ts # mcp/src/index.ts # mcp/src/runner.ts # mcp/src/types.ts # phpcs.xml # plugin_health_check.php # plugin_list.php # plugin_metrics.php # plugin_readiness.php # plugin_validate.php # release/generate_dolibarr_version_txt.php # release/generate_joomla_update_xml.php # src/functions.php # templates/configs/README.md # templates/configs/index.md # templates/configs/manifest.xml.template # templates/configs/manifest.yml.template # templates/configs/mokostandards.xml.template # templates/configs/mokostandards.yml.template # templates/configs/phpcs.xml # templates/docs/README.md # templates/docs/extra/README.md # templates/docs/extra/index.md # templates/docs/index.md # templates/docs/required/GOVERNANCE.md # templates/docs/required/README.md # templates/docs/required/index.md # templates/docs/required/template-CONTRIBUTING.md # templates/docs/required/template-README.md # templates/docs/required/template-SECURITY.md # templates/index.md # templates/licenses/README.md # templates/licenses/index.md # templates/makefiles/README.md # templates/mokogitea/CLAUDE.dolibarr.md.template # templates/mokogitea/CLAUDE.joomla.md.template # templates/mokogitea/CLAUDE.md.template # templates/mokogitea/ISSUE_TEMPLATE/config.yml # templates/mokogitea/ISSUE_TEMPLATE/documentation.md # templates/mokogitea/ISSUE_TEMPLATE/dolibarr_module_id_request.md # templates/mokogitea/ISSUE_TEMPLATE/feature_request.md # templates/mokogitea/ISSUE_TEMPLATE/security.md # templates/mokogitea/README.md # templates/mokogitea/copilot-instructions.dolibarr.md.template # templates/mokogitea/copilot-instructions.joomla.md.template # templates/mokogitea/copilot-instructions.md.template # templates/mokogitea/dependabot.yml.template # templates/mokogitea/override.tf.template # templates/required/README.md # templates/schemas/README.md # templates/schemas/manifest-schema.xsd # templates/schemas/moko-platform-schema.xsd # templates/schemas/mokostandards-schema.xsd # templates/schemas/schemas/README.md # templates/schemas/template-repository-structure.xml # templates/scripts/README.md # templates/scripts/common/CliBase.template.php # templates/scripts/fix/index.md # templates/scripts/index.md # templates/scripts/release/index.md # templates/scripts/release/package_dolibarr.php # templates/scripts/release/package_joomla.php # templates/scripts/sftp-config/README.md # templates/scripts/validate/dolibarr_module.php # templates/scripts/validate/index.md # templates/scripts/validate/validate_manifest.php # templates/scripts/validate/validate_structure.php # templates/security/README.md # templates/security/index.php # templates/stubs/dolibarr.php # templates/stubs/joomla.php # templates/web/index.php # tests/Enterprise/GitPlatformAdapterTest.php # tests/Unit/VersionBumpTest.php # tests/Unit/VersionReadTest.php # tests/index.md # tests/test_circuit_breaker_handling.php # tests/test_enterprise_libraries.php # validate/SECURITY_SCANNING.md # validate/auto_detect_platform.php # validate/check_changelog.php # validate/check_client_theme.php # validate/check_composer_deps.php # validate/check_dolibarr_module.php # validate/check_enterprise_readiness.php # validate/check_file_integrity.php # validate/check_joomla_manifest.php # validate/check_language_structure.php # validate/check_license_headers.php # validate/check_no_secrets.php # validate/check_paths.php # validate/check_php_syntax.php # validate/check_repo_health.php # validate/check_structure.php # validate/check_tabs.php # validate/check_version_consistency.php # validate/check_wiki_health.php # validate/check_xml_wellformed.php # validate/index.md # validate/scan_drift.php # wrappers/auto_detect_platform.php # wrappers/bulk_sync.php # wrappers/check_changelog.php # wrappers/check_dolibarr_module.php # wrappers/check_enterprise_readiness.php # wrappers/check_joomla_manifest.php # wrappers/check_language_structure.php # wrappers/check_license_headers.php # wrappers/check_no_secrets.php # wrappers/check_paths.php # wrappers/check_php_syntax.php # wrappers/check_repo_health.php # wrappers/check_structure.php # wrappers/check_tabs.php # wrappers/check_version_consistency.php # wrappers/check_xml_wellformed.php # wrappers/deploy_sftp.php # wrappers/fix_line_endings.php # wrappers/fix_permissions.php # wrappers/fix_tabs.php # wrappers/fix_trailing_spaces.php # wrappers/gen_wrappers.php # wrappers/index.md # wrappers/pin_action_shas.php # wrappers/plugin_health_check.php # wrappers/plugin_list.php # wrappers/plugin_metrics.php # wrappers/plugin_readiness.php # wrappers/plugin_validate.php # wrappers/scan_drift.php # wrappers/setup_labels.php # wrappers/sync_dolibarr_readmes.php # wrappers/update_sha_hashes.php # wrappers/update_version_from_readme.php
224 lines
7.8 KiB
PHP
224 lines
7.8 KiB
PHP
#!/usr/bin/env php
|
|
<?php
|
|
|
|
/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
*
|
|
* FILE INFORMATION
|
|
<<<<<<< HEAD
|
|
* DEFGROUP: MokoCLI.CLI
|
|
* INGROUP: MokoCLI
|
|
* REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
|
|
* PATH: /cli/version_auto_bump.php
|
|
* VERSION: 09.25.05
|
|
=======
|
|
* DEFGROUP: mokoplatform.CLI
|
|
* INGROUP: mokoplatform
|
|
* REPO: https://git.mokoconsulting.tech/MokoConsulting/mokoplatform
|
|
* PATH: /cli/version_auto_bump.php
|
|
* VERSION: 09.32.00
|
|
>>>>>>> main
|
|
* BRIEF: Auto patch-bump, set stability suffix, and commit — single CLI replacing inline workflow bash
|
|
*/
|
|
|
|
declare(strict_types=1);
|
|
|
|
require_once __DIR__ . '/../lib/Enterprise/CliFramework.php';
|
|
|
|
use MokoCli\CliFramework;
|
|
|
|
class VersionAutoBumpCli extends CliFramework
|
|
{
|
|
protected function configure(): void
|
|
{
|
|
$this->setDescription('Auto patch-bump, set stability suffix, and commit');
|
|
$this->addArgument('--path', 'Repository root path', '.');
|
|
$this->addArgument('--branch', 'Git branch name', '');
|
|
$this->addArgument('--token', 'API token for push', '');
|
|
$this->addArgument('--repo-url', 'Repository URL for git remote', '');
|
|
$this->addArgument('--watch-path', 'Path to watch for changes', '');
|
|
}
|
|
|
|
protected function run(): int
|
|
{
|
|
$path = $this->getArgument('--path');
|
|
$branch = $this->getArgument('--branch');
|
|
$token = $this->getArgument('--token');
|
|
$repoUrl = $this->getArgument('--repo-url');
|
|
$watchPath = $this->getArgument('--watch-path');
|
|
|
|
// Auto-detect branch from git or CI env
|
|
if ($branch === '') {
|
|
$branch = getenv('GITHUB_REF_NAME') ?: trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD 2>/dev/null'));
|
|
if (empty($branch) || $branch === 'HEAD') {
|
|
$this->log('ERROR', 'Cannot detect branch — pass --branch');
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
// Map branch to stability suffix
|
|
$stabilityMap = [
|
|
'dev' => 'dev',
|
|
'alpha' => 'alpha',
|
|
'beta' => 'beta',
|
|
'rc' => 'rc',
|
|
];
|
|
|
|
if (array_key_exists($branch, $stabilityMap)) {
|
|
$stability = $stabilityMap[$branch];
|
|
} elseif (str_starts_with($branch, 'feature/') || str_starts_with($branch, 'patch/')) {
|
|
$stability = 'dev';
|
|
} else {
|
|
$stability = 'dev';
|
|
}
|
|
|
|
$cli = __DIR__;
|
|
$php = '"' . PHP_BINARY . '"';
|
|
|
|
// Auto-detect watch path from manifest.xml if not provided
|
|
if (empty($watchPath)) {
|
|
$manifestFile = realpath($path) . '/.mokogitea/manifest.xml';
|
|
if (file_exists($manifestFile)) {
|
|
$xml = @simplexml_load_file($manifestFile);
|
|
if ($xml && isset($xml->build->{'entry-point'})) {
|
|
$watchPath = (string) $xml->build->{'entry-point'};
|
|
}
|
|
}
|
|
}
|
|
|
|
// Check if code files actually changed (skip bump for docs/config-only changes)
|
|
$shouldBump = true;
|
|
if (!empty($watchPath)) {
|
|
$root = realpath($path) ?: $path;
|
|
$cdCmd = PHP_OS_FAMILY === 'Windows' ? "cd /d " : "cd ";
|
|
$diffOutput = trim((string) @shell_exec(
|
|
$cdCmd . escapeshellarg($root)
|
|
. " && git diff --name-only HEAD~1 HEAD -- "
|
|
. escapeshellarg($watchPath) . " 2>/dev/null"
|
|
));
|
|
if (empty($diffOutput)) {
|
|
echo "No changes in {$watchPath} — skipping version bump\n";
|
|
$shouldBump = false;
|
|
} else {
|
|
echo "Changes detected in {$watchPath}:\n{$diffOutput}\n";
|
|
}
|
|
}
|
|
|
|
if (!$shouldBump) {
|
|
echo "No code changes — nothing to do\n";
|
|
return 0;
|
|
}
|
|
|
|
// Step 1: Patch bump
|
|
$bumpOutput = [];
|
|
exec("{$php} {$cli}/version_bump.php --path " . escapeshellarg($path) . " 2>&1", $bumpOutput, $bumpRc);
|
|
foreach ($bumpOutput as $line) {
|
|
echo "{$line}\n";
|
|
}
|
|
|
|
// Step 2: Read version (--quiet suppresses banner so only the version is output)
|
|
$versionOutput = [];
|
|
exec("{$php} {$cli}/version_read.php --path " . escapeshellarg($path) . " --quiet 2>&1", $versionOutput, $versionRc);
|
|
// Take the last non-empty line — the version is always the final output
|
|
$version = '';
|
|
foreach (array_reverse($versionOutput) as $line) {
|
|
$line = trim($line);
|
|
if (preg_match('/^\d{2}\.\d{2}\.\d{2}/', $line)) {
|
|
$version = $line;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (empty($version)) {
|
|
echo "No version found — skipping\n";
|
|
return 0;
|
|
}
|
|
|
|
echo "Version: {$version} | Branch: {$branch} | Stability: {$stability}\n";
|
|
|
|
// Step 3: Set platform version with stability suffix
|
|
$setPlatOutput = [];
|
|
exec("{$php} {$cli}/version_set_platform.php --path " . escapeshellarg($path)
|
|
. " --version " . escapeshellarg($version)
|
|
. " --branch " . escapeshellarg($branch)
|
|
. " --stability " . escapeshellarg($stability) . " 2>&1", $setPlatOutput);
|
|
foreach ($setPlatOutput as $line) {
|
|
echo "{$line}\n";
|
|
}
|
|
|
|
// Step 4: Version consistency check and fix
|
|
exec("{$php} {$cli}/version_check.php --path " . escapeshellarg($path) . " --fix 2>&1", $checkOutput);
|
|
|
|
// Re-read version (now includes suffix from version_set_platform)
|
|
$suffixMap = [
|
|
'dev' => '-dev',
|
|
'alpha' => '-alpha',
|
|
'beta' => '-beta',
|
|
'rc' => '-rc',
|
|
];
|
|
$displayVersion = preg_replace('/(-(dev|alpha|beta|rc))+$/', '', $version) . ($suffixMap[$stability] ?? '');
|
|
|
|
if ($this->dryRun) {
|
|
echo "[DRY-RUN] Would commit and push {$displayVersion} to {$branch}\n";
|
|
return 0;
|
|
}
|
|
|
|
// Step 5: Git commit and push
|
|
$root = realpath($path) ?: $path;
|
|
|
|
// Check if anything changed
|
|
$cdPrefix = PHP_OS_FAMILY === 'Windows' ? "cd /d " : "cd ";
|
|
$diffStatus = trim((string) @shell_exec(
|
|
$cdPrefix . escapeshellarg($root)
|
|
. " && git diff --quiet && git diff --cached --quiet"
|
|
. " 2>&1 && echo clean || echo dirty"
|
|
));
|
|
if ($diffStatus === 'clean') {
|
|
echo "No version changes to commit\n";
|
|
return 0;
|
|
}
|
|
|
|
// Configure git
|
|
$cd = PHP_OS_FAMILY === 'Windows' ? "cd /d " : "cd ";
|
|
$cdRoot = $cd . escapeshellarg($root);
|
|
@shell_exec(
|
|
$cdRoot . " && git config --local user.email"
|
|
. " \"gitea-actions[bot]@mokoconsulting.tech\""
|
|
);
|
|
@shell_exec(
|
|
$cdRoot . " && git config --local user.name"
|
|
. " \"gitea-actions[bot]\""
|
|
);
|
|
|
|
if (!empty($repoUrl)) {
|
|
@shell_exec(
|
|
$cdRoot . " && git remote set-url origin "
|
|
. escapeshellarg($repoUrl)
|
|
);
|
|
}
|
|
|
|
@shell_exec($cdRoot . " && git add -A");
|
|
$commitMsg = $shouldBump
|
|
? "chore(version): auto-bump patch {$displayVersion} [skip ci]"
|
|
: "chore(version): set {$stability} suffix {$displayVersion} [skip ci]";
|
|
@shell_exec(
|
|
$cdRoot . " && git commit -m " . escapeshellarg($commitMsg)
|
|
. " --author=\"gitea-actions[bot]"
|
|
. " <gitea-actions[bot]@mokoconsulting.tech>\""
|
|
);
|
|
|
|
$pushResult = @shell_exec(
|
|
$cdRoot . " && git push origin "
|
|
. escapeshellarg($branch) . " 2>&1"
|
|
);
|
|
echo $pushResult ?? '';
|
|
|
|
echo "Bumped to {$displayVersion}\n";
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
$app = new VersionAutoBumpCli();
|
|
exit($app->execute());
|