From ef26aa7ea4a958609d1c5bf8227dcb37f1acf48a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 16 Mar 2018 06:28:46 +0100
Subject: [PATCH] fix: rebase lock file maintenance PRs if configured
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes so we skip lock file generation for lock file maintenance branches only if it *doesn’t* need rebasing.
Helps #1655
---
lib/workers/branch/lock-files.js | 2 ++
test/workers/branch/lock-files.spec.js | 1 +
2 files changed, 3 insertions(+)
diff --git a/lib/workers/branch/lock-files.js b/lib/workers/branch/lock-files.js
index f7e1ce3133..7d9cbf309c 100644
--- a/lib/workers/branch/lock-files.js
+++ b/lib/workers/branch/lock-files.js
@@ -376,8 +376,10 @@ async function getUpdatedLockFiles(config) {
const updatedLockFiles = [];
if (
config.type === 'lockFileMaintenance' &&
+ config.parentBranch &&
(await platform.branchExists(config.branchName))
) {
+ logger.debug('Skipping lockFileMaintenance update');
return { lockFileErrors, updatedLockFiles };
}
const dirs = module.exports.determineLockFileDirs(config);
diff --git a/test/workers/branch/lock-files.spec.js b/test/workers/branch/lock-files.spec.js
index 3dfc6c5571..b6b84317fa 100644
--- a/test/workers/branch/lock-files.spec.js
+++ b/test/workers/branch/lock-files.spec.js
@@ -493,6 +493,7 @@ describe('workers/branch/lock-files', () => {
});
it('returns no error and empty lockfiles if lock file maintenance exists', async () => {
config.type = 'lockFileMaintenance';
+ config.parentBranch = 'renovate/lock-file-maintenance';
platform.branchExists.mockReturnValueOnce(true);
const res = await getUpdatedLockFiles(config);
expect(res).toMatchSnapshot();
--
GitLab