Merge branch 'release/v1.2.2'

reliqarts · Nov 8, 2017 · 4f242aa · 4f242aa
2 parents a3159ca + a67f813
commit 4f242aa
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/Services/Publisher.php b/src/Services/Publisher.php
@@ -154,24 +154,26 @@ private function publishVersions($name, $dir, $source, &$callingCommand = null)
 
                 try {
                     $listTags->mustRun();
-                    $tags = array_map('trim', preg_split("[\n\r]", $listTags->getOutput()));
+                    $tags = array_map('trim', preg_split("/[\n\r]/", $listTags->getOutput()));
                     $result->messages = [];
 
                     // publish each tag
                     foreach ($tags as $tag) {
-                        if (!$this->files->isDirectory("$masterDir/../$tag")) {
-                            $cloneTag = new Process("git clone --branch $tag \"{$source}\" ../$tag", $masterDir);
-                            $cloneTag->mustRun();
-                            // publish assets
-                            $product->publishAssets($tag);
-                            $this->tell("Successfully published tag $tag.");
-                            // increment
-                            $versionsPublished++;
-                        } else {
-                            $message = "Version $tag already exists.";
-                            $result->messages[] = $message;
-                            Log::info($message, ['state' => $this, 'product' => $product]);
-                            $this->tell($message);
+                        if (!empty($tag)) {
+                            if (!$this->files->isDirectory("$masterDir/../$tag")) {
+                                $cloneTag = new Process("git clone --branch $tag \"{$source}\" ../$tag", $masterDir);
+                                $cloneTag->mustRun();
+                                // publish assets
+                                $product->publishAssets($tag);
+                                $this->tell("Successfully published tag $tag.");
+                                // increment
+                                $versionsPublished++;
+                            } else {
+                                $message = "Version $tag already exists.";
+                                $result->messages[] = $message;
+                                Log::info($message, ['state' => $this, 'product' => $product]);
+                                $this->tell($message);
+                            }
                         }
                     }
                 } catch (ProcessFailedException $e) {