Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Update release script to use trunk instead of master

Browse Source 
[MAILPOET-3466]
This commit is contained in:
Rodrigo Primo
2022-05-31 10:12:17 +01:00
committed by Rodrigo Primo
parent df62347116
commit e56e2db9ef
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mailpoet/RoboFile.php
View File

@@ -745,10 +745,10 @@ class RoboFile extends \Robo\Tasks {
$this->yell('Please make sure your working directory is clean before running release.', 40, 'red'); $this->yell('Please make sure your working directory is clean before running release.', 40, 'red');
exit(1); exit(1);
} }
// checkout master and pull from remote // checkout trunk and pull from remote
$this->taskGitStack() $this->taskGitStack()
->stopOnFail() ->stopOnFail()
->checkout('master') ->checkout('trunk')
->exec('git pull --ff-only') ->exec('git pull --ff-only')
->run(); ->run();
// make sure release branch doesn't exist on github // make sure release branch doesn't exist on github

4
mailpoet/tasks/release/GitHubController.php
View File

@@ -44,7 +44,7 @@ class GitHubController {
'json' => [ 'json' => [
'title' => 'Release ' . $version, 'title' => 'Release ' . $version,
'head' => self::RELEASE_SOURCE_BRANCH, 'head' => self::RELEASE_SOURCE_BRANCH,
'base' => 'master', 'base' => 'trunk',
], ],
]); ]);
$response = json_decode($response->getBody()->getContents(), true); $response = json_decode($response->getBody()->getContents(), true);
@@ -69,7 +69,7 @@ class GitHubController {
'query' => [ 'query' => [
'state' => 'all', 'state' => 'all',
'head' => self::RELEASE_SOURCE_BRANCH, 'head' => self::RELEASE_SOURCE_BRANCH,
'base' => 'master', 'base' => 'trunk',
'direction' => 'desc', 'direction' => 'desc',
], ],
]); ]);