#11 removed vcs-tag-action workaround, omitting tag message instead

bonndan · Mar 11, 2014 · 4d1ee52 · 4d1ee52
1 parent 3138a2b
commit 4d1ee52
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/Liip/RMT/Command/FinishCommand.php b/src/Liip/RMT/Command/FinishCommand.php
@@ -84,11 +84,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $action->setContext($this->getContext());
         $this->getContext()->getList(Context::POSTRELEASE_LIST)->push($action);
 
-        //push a vcs-tag action (see #11)
-        $tagAction = new \Liip\RMT\Action\VcsTagAction();
-        $tagAction->setContext($this->getContext());
-        $this->getContext()->getList(Context::POSTRELEASE_LIST)->push($tagAction);
-
         parent::execute($input, $output);
     }
 }
diff --git a/src/Liip/RMT/VCS/GitFlow.php b/src/Liip/RMT/VCS/GitFlow.php
@@ -35,7 +35,7 @@ public function finishRelease()
     {
         $detector = new GitFlowBranch($this, GitFlowBranch::RELEASE);
         $version = $detector->getCurrentVersion();
-        $command = 'flow release finish -n ' . $version;
+        $command = 'flow release finish -m "' . $version . '" ' . $version;
         $this->executeGitCommand($command);
         return $version;
     }
@@ -62,7 +62,7 @@ public function finishHotfix()
     {
         $detector = new GitFlowBranch($this, GitFlowBranch::HOTFIX);
         $version = $detector->getCurrentVersion();
-        $command = 'flow hotfix finish -n ' . $version;
+        $command = 'flow hotfix finish -m "' . $version . '" ' . $version;
         $this->executeGitCommand($command);
         return $version;
     }

diff --git a/test/Liip/RMT/Tests/Unit/VCS/GitFlowTest.php b/test/Liip/RMT/Tests/Unit/VCS/GitFlowTest.php
@@ -50,7 +50,7 @@ public function testFinishRelease()
         system("git flow release start 2.2.2 1>/dev/null 2>&1");
 
         $version = $this->gitFlow->finishRelease('test');
-        $this->assertEquals('flow release finish -n 2.2.2', $this->gitFlow->lastCommand);
+        $this->assertEquals('flow release finish -m "2.2.2" 2.2.2', $this->gitFlow->lastCommand);
         $this->assertInstanceOf("\Liip\RMT\Version", $version);
         $this->assertEquals("2.2.2", (string)$version);
     }
@@ -77,7 +77,7 @@ public function testFinishHotfix()
         system("git flow hotfix start 2.2.2 1>/dev/null 2>&1");
 
         $version = $this->gitFlow->finishHotfix('test');
-        $this->assertEquals('flow hotfix finish -n 2.2.2', $this->gitFlow->lastCommand);
+        $this->assertEquals('flow hotfix finish -m "2.2.2" 2.2.2', $this->gitFlow->lastCommand);
         $this->assertInstanceOf("\Liip\RMT\Version", $version);
     }