diff --git a/lib/config/migration.ts b/lib/config/migration.ts index 4deceaaa56d0e19f23e4145143a2aebb44cb6820..52a4cdea3a0da94b67929e6fcff3e2defff40740 100644 --- a/lib/config/migration.ts +++ b/lib/config/migration.ts @@ -128,9 +128,6 @@ export function migrateConfig( } else { migratedConfig.semanticCommitScope = null; } - } else if (key === 'separateMajorReleases') { - delete migratedConfig.separateMultipleMajor; - migratedConfig.separateMajorMinor = val; } else if (is.string(val) && val.startsWith('{{semanticPrefix}}')) { migratedConfig[key] = val.replace( '{{semanticPrefix}}', diff --git a/lib/config/migrations/base/abstract-migration.ts b/lib/config/migrations/base/abstract-migration.ts index 78ff8b457a2c068c1e41dd43ae217cff8dd6a1ad..80fdcb65868078a1c4d80a97f6b0a97fc1389cb9 100644 --- a/lib/config/migrations/base/abstract-migration.ts +++ b/lib/config/migrations/base/abstract-migration.ts @@ -21,6 +21,10 @@ export abstract class AbstractMigration implements Migration { return this.migratedConfig[key] ?? this.originalConfig[key]; } + protected has<Key extends keyof RenovateConfig>(key: Key): boolean { + return key in this.originalConfig; + } + protected setSafely<Key extends keyof RenovateConfig>( key: Key, value: RenovateConfig[Key] diff --git a/lib/config/migrations/custom/separate-major-release-migration.spec.ts b/lib/config/migrations/custom/separate-major-release-migration.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..e43742bec3423f130cbad16bc2e2a3fd7443f3c0 --- /dev/null +++ b/lib/config/migrations/custom/separate-major-release-migration.spec.ts @@ -0,0 +1,15 @@ +import { SeparateMajorReleasesMigration } from './separate-major-release-migration'; + +describe('config/migrations/custom/separate-major-release-migration', () => { + it('should migrate', () => { + expect(SeparateMajorReleasesMigration).toMigrate( + { + separateMajorReleases: true, + }, + { + separateMajorMinor: true, + separateMajorReleases: true, + } + ); + }); +}); diff --git a/lib/config/migrations/custom/separate-major-release-migration.ts b/lib/config/migrations/custom/separate-major-release-migration.ts new file mode 100644 index 0000000000000000000000000000000000000000..ba31f27494b0823a0864d7d306c01db36a41f002 --- /dev/null +++ b/lib/config/migrations/custom/separate-major-release-migration.ts @@ -0,0 +1,9 @@ +import { AbstractMigration } from '../base/abstract-migration'; + +export class SeparateMajorReleasesMigration extends AbstractMigration { + override readonly propertyName = 'separateMajorReleases'; + + override run(value: unknown): void { + this.setSafely('separateMajorMinor', value); + } +} diff --git a/lib/config/migrations/custom/separate-multiple-major-migration.spec.ts b/lib/config/migrations/custom/separate-multiple-major-migration.spec.ts new file mode 100644 index 0000000000000000000000000000000000000000..ff1ce38fe5171fa24a00fb613cb3a6024a28e744 --- /dev/null +++ b/lib/config/migrations/custom/separate-multiple-major-migration.spec.ts @@ -0,0 +1,27 @@ +import { SeparateMultipleMajorMigration } from './separate-multiple-major-migration'; + +describe('config/migrations/custom/separate-multiple-major-migration', () => { + it('should remove if separateMajorReleases exists', () => { + expect(SeparateMultipleMajorMigration).toMigrate( + { + separateMajorReleases: true, + separateMultipleMajor: true, + }, + { + separateMajorReleases: true, + } + ); + }); + + it('should skip if separateMajorReleases does not exist', () => { + expect(SeparateMultipleMajorMigration).toMigrate( + { + separateMultipleMajor: true, + }, + { + separateMultipleMajor: true, + }, + false + ); + }); +}); diff --git a/lib/config/migrations/custom/separate-multiple-major-migration.ts b/lib/config/migrations/custom/separate-multiple-major-migration.ts new file mode 100644 index 0000000000000000000000000000000000000000..7eff203c25cc1cde8c5ce62acef9c377c887ee85 --- /dev/null +++ b/lib/config/migrations/custom/separate-multiple-major-migration.ts @@ -0,0 +1,11 @@ +import { AbstractMigration } from '../base/abstract-migration'; + +export class SeparateMultipleMajorMigration extends AbstractMigration { + override readonly propertyName = 'separateMultipleMajor'; + + override run(): void { + if (this.has('separateMajorReleases')) { + this.delete(); + } + } +} diff --git a/lib/config/migrations/migrations-service.ts b/lib/config/migrations/migrations-service.ts index b97e2a4556c035b9f44d10a02c4a0d626fe68d3b..b5203a46a70f8859e04cfe8dd68f666118082291 100644 --- a/lib/config/migrations/migrations-service.ts +++ b/lib/config/migrations/migrations-service.ts @@ -31,6 +31,8 @@ import { RenovateForkMigration } from './custom/renovate-fork-migration'; import { RequiredStatusChecksMigration } from './custom/required-status-checks-migration'; import { ScheduleMigration } from './custom/schedule-migration'; import { SemanticCommitsMigration } from './custom/semantic-commits-migration'; +import { SeparateMajorReleasesMigration } from './custom/separate-major-release-migration'; +import { SeparateMultipleMajorMigration } from './custom/separate-multiple-major-migration'; import { SuppressNotificationsMigration } from './custom/suppress-notifications-migration'; import { TrustLevelMigration } from './custom/trust-level-migration'; import { UnpublishSafeMigration } from './custom/unpublish-safe-migration'; @@ -98,6 +100,8 @@ export class MigrationsService { RequiredStatusChecksMigration, ScheduleMigration, SemanticCommitsMigration, + SeparateMajorReleasesMigration, + SeparateMultipleMajorMigration, SuppressNotificationsMigration, TrustLevelMigration, UnpublishSafeMigration,