diff --git a/lib/config/definitions.js b/lib/config/definitions.js index 9c1ad285dc6e7af2de72b7ed8d708c87900b7c87..262416f593159c30a1e87ab692bebfeb480f059d 100644 --- a/lib/config/definitions.js +++ b/lib/config/definitions.js @@ -262,6 +262,7 @@ const options = [ type: 'json', default: { enabled: true, + recreateClosed: true, branchName: 'renovate/lock-files', commitMessage: '{{semanticPrefix}}Update lock file', prTitle: '{{semanticPrefix}}Lock file maintenance', @@ -301,6 +302,7 @@ const options = [ description: 'Config if groupName is enabled', type: 'json', default: { + recreateClosed: true, branchName: template('branchName', 'group'), commitMessage: template('commitMessage', 'group'), prTitle: template('prTitle', 'group'), diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js index 11880291fc160b9a7f4854f6ab02f0eb5cdadba0..26266f18067c6e62627422903b0b566c67cb0c0e 100644 --- a/lib/workers/branch/index.js +++ b/lib/workers/branch/index.js @@ -221,9 +221,8 @@ async function updateBranch(upgrades) { try { if ( - upgrade0.upgradeType !== 'lockFileMaintenance' && - upgrade0.groupName === null && - !upgrade0.recreateClosed && + // Groups and lock file maintenance should set this to true + upgrade0.recreateClosed === false && (await upgrade0.api.checkForClosedPr(branchName, prTitle)) ) { logger.info(`Skipping branch as matching closed PR already existed`); diff --git a/test/config/__snapshots__/index.spec.js.snap b/test/config/__snapshots__/index.spec.js.snap index 6d3c38b5e10ea4e232ce7a54f3c46cce14bdfd94..a7f4fad42ba431abd217c887aa0f430b91f1e9d2 100644 --- a/test/config/__snapshots__/index.spec.js.snap +++ b/test/config/__snapshots__/index.spec.js.snap @@ -7,6 +7,7 @@ Object { "enabled": true, "prBody": "This PR regenerates lock files to keep them up-to-date.", "prTitle": "{{semanticPrefix}}Lock file maintenance", + "recreateClosed": true, "schedule": "on monday", } `;