Show merge errors

nucleos · Feb 15, 2021 · 363f9ae · 363f9ae
1 parent 7bc7cb3
commit 363f9ae
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Command/MergeCommand.php b/src/Command/MergeCommand.php
@@ -11,6 +11,7 @@
 
 namespace Nucleos\AutoMergeAction\Command;
 
+use Github\Exception\RuntimeException;
 use Nucleos\AutoMergeAction\Client\PullRequest\Query;
 use Nucleos\AutoMergeAction\Client\PullRequests;
 use Nucleos\AutoMergeAction\Config\Configuration;
@@ -102,22 +103,28 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         ]);
 
         foreach ($pullRequests as $pullRequest) {
-            $status = '<fg=red>ERROR</>';
+            $status = '<fg=red>UNSTABLE</>';
 
             if ($pullRequest->updatedWithinTheLast60Seconds()) {
                 $status = '<fg=yellow>SKIPPED</>';
             } elseif (true === $pullRequest->isMergeable() && $pullRequest->isCleanBuild()) {
                 if ($config->isDryRun()) {
                     $io->write('<fg=yellow>READY</> ');
                 } else {
-                    $this->pullRequests->merge($repository, $pullRequest, $config->isSquash());
-                    $this->pullRequests->removeLabel($repository, $pullRequest, $label);
-
                     if ($config->isSquash()) {
                         $status = '<fg=green>SQUASHED</>';
                     } else {
                         $status = '<fg=green>MERGED</>';
                     }
+
+                    try {
+                        $this->pullRequests->merge($repository, $pullRequest, $config->isSquash());
+                        $this->pullRequests->removeLabel($repository, $pullRequest, $label);
+                    } catch (RuntimeException $exception) {
+                        $status = '<fg=red>ERROR</>';
+
+                        $io->error($exception->getMessage());
+                    }
                 }
             }