From 0e0f08b5999f5960bd30ed05e4879ed55a2fbca3 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Thu, 10 Jun 2021 21:32:00 +0200
Subject: [PATCH] chore: log mergePr result

---
 lib/platform/github/index.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/platform/github/index.ts b/lib/platform/github/index.ts
index 18a7ca7838..67b6331793 100644
--- a/lib/platform/github/index.ts
+++ b/lib/platform/github/index.ts
@@ -1584,12 +1584,13 @@ export async function mergePr(
     options.token = config.forkToken;
   }
   let automerged = false;
+  let automergeResult: any;
   if (config.mergeMethod) {
     // This path is taken if we have auto-detected the allowed merge types from the repo
     options.body.merge_method = config.mergeMethod;
     try {
       logger.debug({ options, url }, `mergePr`);
-      await githubApi.putJson(url, options);
+      automergeResult = await githubApi.putJson(url, options);
       automerged = true;
     } catch (err) {
       if (err.statusCode === 404 || err.statusCode === 405) {
@@ -1609,19 +1610,19 @@ export async function mergePr(
     options.body.merge_method = 'rebase';
     try {
       logger.debug({ options, url }, `mergePr`);
-      await githubApi.putJson(url, options);
+      automergeResult = await githubApi.putJson(url, options);
     } catch (err1) {
       logger.debug({ err: err1 }, `Failed to rebase merge PR`);
       try {
         options.body.merge_method = 'squash';
         logger.debug({ options, url }, `mergePr`);
-        await githubApi.putJson(url, options);
+        automergeResult = await githubApi.putJson(url, options);
       } catch (err2) {
         logger.debug({ err: err2 }, `Failed to merge squash PR`);
         try {
           options.body.merge_method = 'merge';
           logger.debug({ options, url }, `mergePr`);
-          await githubApi.putJson(url, options);
+          automergeResult = await githubApi.putJson(url, options);
         } catch (err3) {
           logger.debug({ err: err3 }, `Failed to merge commit PR`);
           logger.info({ pr: prNo }, 'All merge attempts failed');
@@ -1630,7 +1631,10 @@ export async function mergePr(
       }
     }
   }
-  logger.debug({ pr: prNo }, 'PR merged');
+  logger.debug(
+    { automergeResult: automergeResult.body, pr: prNo },
+    'PR merged'
+  );
   // Delete branch
   await deleteBranch(branchName);
   return true;
-- 
GitLab