diff --git a/lib/platform/github/index.js b/lib/platform/github/index.js index 8f5deb0fd67450d4ed1bbf8438407acfcab502f8..aa9e8efe11f7eb8f7cf866d60da9a2d315b8b1ea 100644 --- a/lib/platform/github/index.js +++ b/lib/platform/github/index.js @@ -779,7 +779,7 @@ async function createPr( `repos/${config.parentRepo || config.repository}/pulls`, options )).body; - logger.info({ branchName, pr: pr.number }, 'PR created'); + logger.debug({ branchName, pr: pr.number }, 'PR created'); pr.displayNumber = `Pull Request #${pr.number}`; pr.branchName = branchName; await addLabels(pr.number, labels); @@ -913,7 +913,7 @@ async function updatePr(prNo, title, body) { `repos/${config.parentRepo || config.repository}/pulls/${prNo}`, options ); - logger.info({ pr: prNo }, 'PR updated'); + logger.debug({ pr: prNo }, 'PR updated'); } async function mergePr(prNo, branchName) { @@ -1005,7 +1005,7 @@ async function mergePr(prNo, branchName) { } } } - logger.info({ pr: prNo }, 'PR merged'); + logger.debug({ pr: prNo }, 'PR merged'); // Update base branch SHA config.baseCommitSHA = null; // Delete branch diff --git a/lib/platform/github/storage.js b/lib/platform/github/storage.js index a6bb0cdf923e2a6b1fe30aed07e1c0228f015b1e..e4eb73dd9b1ef3d184ce95c32ef65c7c33a2b3a4 100644 --- a/lib/platform/github/storage.js +++ b/lib/platform/github/storage.js @@ -181,7 +181,7 @@ class Storage { }; try { await get.patch(url, options); - logger.info({ branchName }, 'Branch merged'); + logger.debug({ branchName }, 'Branch merged'); } catch (err) { logger.info( expandError(err), @@ -298,11 +298,12 @@ class Storage { try { if (isBranchExisting) { await updateBranch(branchName, commit); - logger.info({ branchName }, 'Branch updated'); - } else { - await createBranch(branchName, commit); - logger.info({ branchName }, 'Branch created'); + logger.debug({ branchName }, 'Branch updated'); + return 'updated'; } + await createBranch(branchName, commit); + logger.debug({ branchName }, 'Branch created'); + return 'created'; } catch (err) /* istanbul ignore next */ { logger.debug({ files: files.filter( diff --git a/lib/platform/gitlab/index.js b/lib/platform/gitlab/index.js index 87e10b8de52398f85bdce25a2ce5e6ca1d48ee17..db8dfa6a6a00267059096cd25723b38d26c12785 100644 --- a/lib/platform/gitlab/index.js +++ b/lib/platform/gitlab/index.js @@ -776,10 +776,12 @@ async function commitFilesToBranch( action.action = (await getFile(file.name)) ? 'update' : 'create'; opts.body.actions.push(action); } + let res = 'created'; try { if (await branchExists(branchName)) { logger.debug('Deleting existing branch'); await deleteBranch(branchName); + res = 'updated'; } } catch (err) { // istanbul ignore next @@ -794,6 +796,7 @@ async function commitFilesToBranch( logger.debug('Reopening PR'); await reopenPr(pr.number); } + return res; } // GET /projects/:id/repository/commits diff --git a/lib/workers/branch/automerge.js b/lib/workers/branch/automerge.js index eae321c1fc52d9964573d3e48e0105a60a634a7f..c57d60d3e263af77da9cf00df7c9291c1995d692 100644 --- a/lib/workers/branch/automerge.js +++ b/lib/workers/branch/automerge.js @@ -19,6 +19,7 @@ async function tryBranchAutomerge(config) { logger.debug(`Automerging branch`); try { await platform.mergeBranch(config.branchName); + logger.info({ branchName: config.branchName }, 'Branch automerged'); return 'automerged'; // Branch no longer exists } catch (err) { logger.info({ err }, `Failed to automerge branch`); diff --git a/lib/workers/branch/commit.js b/lib/workers/branch/commit.js index a031e6234abd4504ddf71b5a22bc71283bf7b667..5aceee88eacf43ea2c71feb32d7acd10379d9d43 100644 --- a/lib/workers/branch/commit.js +++ b/lib/workers/branch/commit.js @@ -12,12 +12,15 @@ async function commitFilesToBranch(config) { logger.debug(`${updatedFiles.length} file(s) to commit`); // API will know whether to create new branch or not - await platform.commitFilesToBranch( + const res = await platform.commitFilesToBranch( config.branchName, updatedFiles, config.commitMessage, config.parentBranch || config.baseBranch || undefined ); + if (res) { + logger.info({ branchName: config.branchName }, `Branch ${res}`); + } } else { logger.debug(`No files to commit`); return false; diff --git a/lib/workers/pr/index.js b/lib/workers/pr/index.js index 18f2fc53ac9519a35a4e4d9abc01af3499493283..1a1fe65f88826bc67a409e3269610040bcb66f92 100644 --- a/lib/workers/pr/index.js +++ b/lib/workers/pr/index.js @@ -237,7 +237,7 @@ async function ensurePr(prConfig) { } await platform.updatePr(existingPr.number, prTitle, prBody); - logger.info({ pr: existingPr.displayNumber }, `Updated PR`); + logger.info({ pr: existingPr.number }, `PR updated`); return existingPr; } logger.debug({ branchName, prTitle }, `Creating PR`); @@ -255,6 +255,7 @@ async function ensurePr(prConfig) { false, config.statusCheckVerify ); + logger.info({ branchName, pr: pr.number }, 'PR created'); } catch (err) { logger.warn( { @@ -388,7 +389,9 @@ async function checkAutoMerge(pr, config) { } // Let's merge this logger.debug(`Automerging #${pr.number}`); - return platform.mergePr(pr.number, branchName); + const res = platform.mergePr(pr.number, branchName); + logger.info({ pr: pr.number }, 'PR automerged'); + return res; } logger.debug('No automerge'); return false; diff --git a/test/workers/branch/commit.spec.js b/test/workers/branch/commit.spec.js index f1455a57ae37fd6243bec1c23b0f2ec82aaa923d..2e9eaf644f11b85e0a4e031a72888b6930326a2c 100644 --- a/test/workers/branch/commit.spec.js +++ b/test/workers/branch/commit.spec.js @@ -16,6 +16,7 @@ describe('workers/branch/automerge', () => { updatedLockFiles: [], }; jest.resetAllMocks(); + platform.commitFilesToBranch.mockReturnValueOnce('created'); }); it('handles empty files', async () => { await commitFilesToBranch(config);