Skip to content

Commit d671dbf

Browse files
Copilotadamziel
andcommitted
Use default PushNextDevReleaseWorker with explicit branch parameter configuration
Co-authored-by: adamziel <[email protected]>
1 parent bab538d commit d671dbf

File tree

3 files changed

+10
-120
lines changed

3 files changed

+10
-120
lines changed

.monorepo-builder/CustomPushNextDevReleaseWorker.php

Lines changed: 0 additions & 116 deletions
This file was deleted.

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@
7373
"psr-4": {
7474
"Rowbot\\": "components/DataLiberation/vendor-patched/",
7575
"Brick\\": "components/DataLiberation/vendor-patched/",
76-
"WordPress\\CORSProxy\\": "components/CORSProxy/",
77-
"WordPressPhpToolkit\\MonorepoBuilder\\": ".monorepo-builder/"
76+
"WordPress\\CORSProxy\\": "components/CORSProxy/"
7877
}
7978
},
8079
"scripts": {

monorepo-builder.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44

55
use Symplify\MonorepoBuilder\Config\MBConfig;
66
use Symplify\MonorepoBuilder\Release\ReleaseWorker\AddTagToChangelogReleaseWorker;
7+
use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushNextDevReleaseWorker;
78
use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushTagReleaseWorker;
89
use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetCurrentMutualDependenciesReleaseWorker;
910
use Symplify\MonorepoBuilder\Release\ReleaseWorker\SetNextMutualDependenciesReleaseWorker;
1011
use Symplify\MonorepoBuilder\Release\ReleaseWorker\TagVersionReleaseWorker;
1112
use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateBranchAliasReleaseWorker;
1213
use Symplify\MonorepoBuilder\Release\ReleaseWorker\UpdateReplaceReleaseWorker;
13-
use WordPressPhpToolkit\MonorepoBuilder\CustomPushNextDevReleaseWorker;
14+
use Symplify\MonorepoBuilder\ValueObject\Option;
1415

1516
return static function ( MBConfig $config ): void {
1617
// Where packages live.
@@ -19,7 +20,13 @@
1920
__DIR__ . '/components',
2021
)
2122
);
23+
24+
// Set the default branch name for release workers.
2225
$config->defaultBranch( 'trunk' );
26+
27+
// Set the branch name parameter explicitly for PushNextDevReleaseWorker.
28+
$config->parameters()->set( Option::DEFAULT_BRANCH_NAME, 'trunk' );
29+
2330
// Release workers - in order to execute.
2431
$config->workers(
2532
array(
@@ -30,7 +37,7 @@
3037
PushTagReleaseWorker::class,
3138
SetNextMutualDependenciesReleaseWorker::class,
3239
UpdateBranchAliasReleaseWorker::class,
33-
CustomPushNextDevReleaseWorker::class,
40+
PushNextDevReleaseWorker::class,
3441
)
3542
);
3643
};

0 commit comments

Comments
 (0)