diff --git a/lib/config/migration.js b/lib/config/migration.js index df9c5a4ba7299926db970fdbcca83a5b19183619..3b07c09776b4ffb96b1d9ab26db08ee83e7389e5 100644 --- a/lib/config/migration.js +++ b/lib/config/migration.js @@ -33,6 +33,21 @@ function migrateConfig(config, parentConfig) { if (removedOptions.includes(key)) { isMigrated = true; delete migratedConfig[key]; + } else if (key === 'automergeMinor') { + isMigrated = true; + migratedConfig.minor = migratedConfig.minor || {}; + migratedConfig.minor.automerge = val; + delete migratedConfig[key]; + } else if (key === 'automergeMajor') { + isMigrated = true; + migratedConfig.major = migratedConfig.major || {}; + migratedConfig.major.automerge = val; + delete migratedConfig[key]; + } else if (key === 'automergePatch') { + isMigrated = true; + migratedConfig.patch = migratedConfig.patch || {}; + migratedConfig.patch.automerge = val; + delete migratedConfig[key]; } else if (key === 'ignoreNodeModules') { isMigrated = true; delete migratedConfig.ignoreNodeModules; diff --git a/test/config/__snapshots__/migration.spec.js.snap b/test/config/__snapshots__/migration.spec.js.snap index b9de284329459f576f121386eca7a4f0cf133b3a..dab695f65828cb7951feea2d5d75179ccb04736d 100644 --- a/test/config/__snapshots__/migration.spec.js.snap +++ b/test/config/__snapshots__/migration.spec.js.snap @@ -26,6 +26,12 @@ Object { "lockFileConfig": Object { "automerge": true, }, + "major": Object { + "automerge": false, + }, + "minor": Object { + "automerge": true, + }, "onboarding": false, "optionalDependencies": Object { "major": Object { @@ -58,6 +64,9 @@ Object { ], }, ], + "patch": Object { + "automerge": true, + }, "prTitle": "some pr title", "schedule": "on the first day of the month", "semanticPrefix": "fix(deps):", diff --git a/test/config/migration.spec.js b/test/config/migration.spec.js index 05e409cbd16705600d0f6b49a081d20874159490..a6fc6c24360695f51a94b5b83b8e61dfb3aca6ac 100644 --- a/test/config/migration.spec.js +++ b/test/config/migration.spec.js @@ -9,6 +9,9 @@ describe('config/migration', () => { maintainYarnLock: true, onboarding: 'false', automerge: 'none', + automergeMajor: false, + automergeMinor: true, + automergePatch: true, ignoreNodeModules: true, autodiscover: 'true', schedule: 'on the last day of the month',