From 8752790b3ffc8ae6f3cbf98b1f0b69978b5b6fa8 Mon Sep 17 00:00:00 2001 From: Kuba Turek Date: Sun, 1 Feb 2015 12:02:22 +0100 Subject: [PATCH 1/2] [#185] Create release directory for GitRebase strategy if releases are enabled --- .../BuiltIn/Deployment/Strategy/GitRebaseTask.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php b/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php index b19e06e..65d8c76 100644 --- a/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php +++ b/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php @@ -34,6 +34,17 @@ class GitRebaseTask extends BaseStrategyTaskAbstract implements IsReleaseAware */ public function run() { + $this->checkOverrideRelease(); + + if ($this->getConfig()->release('enabled', false) == true) { + $releasesDirectory = $this->getConfig()->release('directory', 'releases'); + + $deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/') + . '/' . $releasesDirectory + . '/' . $this->getConfig()->getReleaseId(); + $this->runCommandRemote('mkdir -p ' . $deployToDirectory . '/' . $this->getConfig()->getReleaseId()); + } + $branch = $this->getParameter('branch', 'master'); $remote = $this->getParameter('remote', 'origin'); From 24b893bd7c5aa6be01d05c026d527190449fff02 Mon Sep 17 00:00:00 2001 From: Kuba Turek Date: Fri, 6 Feb 2015 20:50:07 +0100 Subject: [PATCH 2/2] Fix remote deployment path for GitRebaseTask --- Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php b/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php index 65d8c76..801fa73 100644 --- a/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php +++ b/Mage/Task/BuiltIn/Deployment/Strategy/GitRebaseTask.php @@ -42,7 +42,7 @@ class GitRebaseTask extends BaseStrategyTaskAbstract implements IsReleaseAware $deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $releasesDirectory . '/' . $this->getConfig()->getReleaseId(); - $this->runCommandRemote('mkdir -p ' . $deployToDirectory . '/' . $this->getConfig()->getReleaseId()); + $this->runCommandRemote('mkdir -p ' . $deployToDirectory); } $branch = $this->getParameter('branch', 'master');