From e56e2db9efd98a9e2825bf621b366889cec02e4b Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigo@automattic.com>
Date: Tue, 31 May 2022 10:12:17 +0100
Subject: [PATCH] Update release script to use trunk instead of master

[MAILPOET-3466]
---
 mailpoet/RoboFile.php                       | 4 ++--
 mailpoet/tasks/release/GitHubController.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mailpoet/RoboFile.php b/mailpoet/RoboFile.php
index 3d78033e18..4ac9caf1c3 100644
--- a/mailpoet/RoboFile.php
+++ b/mailpoet/RoboFile.php
@@ -745,10 +745,10 @@ class RoboFile extends \Robo\Tasks {
       $this->yell('Please make sure your working directory is clean before running release.', 40, 'red');
       exit(1);
     }
-    // checkout master and pull from remote
+    // checkout trunk and pull from remote
     $this->taskGitStack()
       ->stopOnFail()
-      ->checkout('master')
+      ->checkout('trunk')
       ->exec('git pull --ff-only')
       ->run();
     // make sure release branch doesn't exist on github
diff --git a/mailpoet/tasks/release/GitHubController.php b/mailpoet/tasks/release/GitHubController.php
index 5c71bd95ed..601bdea3c5 100644
--- a/mailpoet/tasks/release/GitHubController.php
+++ b/mailpoet/tasks/release/GitHubController.php
@@ -44,7 +44,7 @@ class GitHubController {
       'json' => [
         'title' => 'Release ' . $version,
         'head' => self::RELEASE_SOURCE_BRANCH,
-        'base' => 'master',
+        'base' => 'trunk',
       ],
     ]);
     $response = json_decode($response->getBody()->getContents(), true);
@@ -69,7 +69,7 @@ class GitHubController {
       'query' => [
         'state' => 'all',
         'head' => self::RELEASE_SOURCE_BRANCH,
-        'base' => 'master',
+        'base' => 'trunk',
         'direction' => 'desc',
       ],
     ]);