From 089b1588a39a0d7aca036ffcee96ec037938c884 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 19 Nov 2025 17:12:32 +0000 Subject: [PATCH 1/4] Initial plan From bab538de31b339048a7acdd94d8adc7de5e68e96 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 19 Nov 2025 17:24:17 +0000 Subject: [PATCH 2/4] Fix packagist release by using custom PushNextDevReleaseWorker that respects the configured default branch Co-authored-by: adamziel <205419+adamziel@users.noreply.github.com> --- .../CustomPushNextDevReleaseWorker.php | 116 ++++++++++++++++++ composer.json | 3 +- monorepo-builder.php | 4 +- 3 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 .monorepo-builder/CustomPushNextDevReleaseWorker.php diff --git a/.monorepo-builder/CustomPushNextDevReleaseWorker.php b/.monorepo-builder/CustomPushNextDevReleaseWorker.php new file mode 100644 index 00000000..c9cc6750 --- /dev/null +++ b/.monorepo-builder/CustomPushNextDevReleaseWorker.php @@ -0,0 +1,116 @@ +processRunner = $processRunner; + $this->versionUtils = $versionUtils; + $this->composerJsonProvider = $composerJsonProvider; + $this->devMasterAliasUpdater = $devMasterAliasUpdater; + $this->parameterProvider = $parameterProvider; + } + + /** + * Perform the work of pushing the next dev release. + * + * @param Version $version Version to release. + */ + public function work( Version $version ): void { + // Get the configured default branch from parameters. + $defaultBranch = $this->parameterProvider->provideParameter( Option::DEFAULT_BRANCH ); + + $versionInString = $this->versionUtils->getRequiredNextAliasFormat( $version ); + + $gitAddCommitCommand = sprintf( + 'git add . && git commit --allow-empty -m "open %s" && git push origin "%s"', + $versionInString, + $defaultBranch + ); + + $this->processRunner->run( $gitAddCommitCommand ); + } + + /** + * Get the description of this release worker. + * + * @param Version $version Version to release. + * @return string Description. + */ + public function getDescription( Version $version ): string { + $versionInString = $this->versionUtils->getRequiredNextAliasFormat( $version ); + + // Get the configured default branch from parameters. + $defaultBranch = $this->parameterProvider->provideParameter( Option::DEFAULT_BRANCH ); + + return sprintf( 'Push "%s" open to remote repository on branch "%s"', $versionInString, $defaultBranch ); + } +} diff --git a/composer.json b/composer.json index 6d52bb4b..0cea73a0 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,8 @@ "psr-4": { "Rowbot\\": "components/DataLiberation/vendor-patched/", "Brick\\": "components/DataLiberation/vendor-patched/", - "WordPress\\CORSProxy\\": "components/CORSProxy/" + "WordPress\\CORSProxy\\": "components/CORSProxy/", + "WordPressPhpToolkit\\MonorepoBuilder\\": ".monorepo-builder/" } }, "scripts": { diff --git a/monorepo-builder.php b/monorepo-builder.php index 6e136b55..efcae10a 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -4,13 +4,13 @@ use Symplify\MonorepoBuilder\Config\MBConfig; use Symplify\MonorepoBuilder\Release\ReleaseWorker\AddTagToChangelogReleaseWorker; -use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushNextDevReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushTagReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetCurrentMutualDependenciesReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetNextMutualDependenciesReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\TagVersionReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateBranchAliasReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateReplaceReleaseWorker; +use WordPressPhpToolkit\MonorepoBuilder\CustomPushNextDevReleaseWorker; return static function ( MBConfig $config ): void { // Where packages live. @@ -30,7 +30,7 @@ PushTagReleaseWorker::class, SetNextMutualDependenciesReleaseWorker::class, UpdateBranchAliasReleaseWorker::class, - PushNextDevReleaseWorker::class, + CustomPushNextDevReleaseWorker::class, ) ); }; From d671dbf21e2aa2847cc17243cb3da5d635798bc2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 20 Nov 2025 11:50:51 +0000 Subject: [PATCH 3/4] Use default PushNextDevReleaseWorker with explicit branch parameter configuration Co-authored-by: adamziel <205419+adamziel@users.noreply.github.com> --- .../CustomPushNextDevReleaseWorker.php | 116 ------------------ composer.json | 3 +- monorepo-builder.php | 11 +- 3 files changed, 10 insertions(+), 120 deletions(-) delete mode 100644 .monorepo-builder/CustomPushNextDevReleaseWorker.php diff --git a/.monorepo-builder/CustomPushNextDevReleaseWorker.php b/.monorepo-builder/CustomPushNextDevReleaseWorker.php deleted file mode 100644 index c9cc6750..00000000 --- a/.monorepo-builder/CustomPushNextDevReleaseWorker.php +++ /dev/null @@ -1,116 +0,0 @@ -processRunner = $processRunner; - $this->versionUtils = $versionUtils; - $this->composerJsonProvider = $composerJsonProvider; - $this->devMasterAliasUpdater = $devMasterAliasUpdater; - $this->parameterProvider = $parameterProvider; - } - - /** - * Perform the work of pushing the next dev release. - * - * @param Version $version Version to release. - */ - public function work( Version $version ): void { - // Get the configured default branch from parameters. - $defaultBranch = $this->parameterProvider->provideParameter( Option::DEFAULT_BRANCH ); - - $versionInString = $this->versionUtils->getRequiredNextAliasFormat( $version ); - - $gitAddCommitCommand = sprintf( - 'git add . && git commit --allow-empty -m "open %s" && git push origin "%s"', - $versionInString, - $defaultBranch - ); - - $this->processRunner->run( $gitAddCommitCommand ); - } - - /** - * Get the description of this release worker. - * - * @param Version $version Version to release. - * @return string Description. - */ - public function getDescription( Version $version ): string { - $versionInString = $this->versionUtils->getRequiredNextAliasFormat( $version ); - - // Get the configured default branch from parameters. - $defaultBranch = $this->parameterProvider->provideParameter( Option::DEFAULT_BRANCH ); - - return sprintf( 'Push "%s" open to remote repository on branch "%s"', $versionInString, $defaultBranch ); - } -} diff --git a/composer.json b/composer.json index 0cea73a0..6d52bb4b 100644 --- a/composer.json +++ b/composer.json @@ -73,8 +73,7 @@ "psr-4": { "Rowbot\\": "components/DataLiberation/vendor-patched/", "Brick\\": "components/DataLiberation/vendor-patched/", - "WordPress\\CORSProxy\\": "components/CORSProxy/", - "WordPressPhpToolkit\\MonorepoBuilder\\": ".monorepo-builder/" + "WordPress\\CORSProxy\\": "components/CORSProxy/" } }, "scripts": { diff --git a/monorepo-builder.php b/monorepo-builder.php index efcae10a..394de234 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -4,13 +4,14 @@ use Symplify\MonorepoBuilder\Config\MBConfig; use Symplify\MonorepoBuilder\Release\ReleaseWorker\AddTagToChangelogReleaseWorker; +use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushNextDevReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushTagReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetCurrentMutualDependenciesReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetNextMutualDependenciesReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\TagVersionReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateBranchAliasReleaseWorker; use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateReplaceReleaseWorker; -use WordPressPhpToolkit\MonorepoBuilder\CustomPushNextDevReleaseWorker; +use Symplify\MonorepoBuilder\ValueObject\Option; return static function ( MBConfig $config ): void { // Where packages live. @@ -19,7 +20,13 @@ __DIR__ . '/components', ) ); + + // Set the default branch name for release workers. $config->defaultBranch( 'trunk' ); + + // Set the branch name parameter explicitly for PushNextDevReleaseWorker. + $config->parameters()->set( Option::DEFAULT_BRANCH_NAME, 'trunk' ); + // Release workers - in order to execute. $config->workers( array( @@ -30,7 +37,7 @@ PushTagReleaseWorker::class, SetNextMutualDependenciesReleaseWorker::class, UpdateBranchAliasReleaseWorker::class, - CustomPushNextDevReleaseWorker::class, + PushNextDevReleaseWorker::class, ) ); }; From 13d6882bc2e3126afe9ba74d75c6f166813039b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Thu, 20 Nov 2025 13:02:10 +0100 Subject: [PATCH 4/4] phpcs --- monorepo-builder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monorepo-builder.php b/monorepo-builder.php index 394de234..d30cc7f8 100644 --- a/monorepo-builder.php +++ b/monorepo-builder.php @@ -20,13 +20,13 @@ __DIR__ . '/components', ) ); - + // Set the default branch name for release workers. $config->defaultBranch( 'trunk' ); - + // Set the branch name parameter explicitly for PushNextDevReleaseWorker. $config->parameters()->set( Option::DEFAULT_BRANCH_NAME, 'trunk' ); - + // Release workers - in order to execute. $config->workers( array(