From f1cbcb3b9454eeac5de787f09d2f7a112645545c Mon Sep 17 00:00:00 2001 From: Brian Phillips <28457+brianphillips@users.noreply.github.com> Date: Fri, 5 Apr 2024 07:10:59 -0500 Subject: [PATCH 1/2] Fix automated release schedule message for releases >= 1.26 With Backstage v1.25 being released a month early, the automated merge messages don't reflect the actual/effective release date. This change adjusts the date to reflect that updated release schedule. Signed-off-by: Brian Phillips <28457+brianphillips@users.noreply.github.com> --- scripts/generate-merge-message.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/generate-merge-message.js b/scripts/generate-merge-message.js index f691c92c79..c8aa481f8f 100755 --- a/scripts/generate-merge-message.js +++ b/scripts/generate-merge-message.js @@ -60,7 +60,12 @@ function getReleaseSchedule() { return Array(100) .fill(0) .map((_, i) => { - const date = getReleaseOfMonth(firstReleaseYear, firstReleaseMonth + i); + // the 1.24 and 1.25 releases were both released in March 2024 + const modifier = i >= 25 ? -1 : 0; + const date = getReleaseOfMonth( + firstReleaseYear, + firstReleaseMonth + i + modifier, + ); return { version: `1.${i}.0`, date }; }); } From f4aed165d275ddb14cf659dcb786499246153644 Mon Sep 17 00:00:00 2001 From: Brian Phillips <28457+brianphillips@users.noreply.github.com> Date: Fri, 5 Apr 2024 07:28:13 -0500 Subject: [PATCH 2/2] make it simpler to add exceptions for future off-schedule releases Signed-off-by: Brian Phillips <28457+brianphillips@users.noreply.github.com> --- scripts/generate-merge-message.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/generate-merge-message.js b/scripts/generate-merge-message.js index c8aa481f8f..7592115e47 100755 --- a/scripts/generate-merge-message.js +++ b/scripts/generate-merge-message.js @@ -57,14 +57,17 @@ function getReleaseSchedule() { const firstReleaseYear = 2022; const firstReleaseMonth = 2; + // for any releases that are off schedule (i.e. v1.25.0 was released + // in the same month as v1.24.0), we need to adjust the release date + const offScheduleReleases = [25]; + return Array(100) .fill(0) .map((_, i) => { - // the 1.24 and 1.25 releases were both released in March 2024 - const modifier = i >= 25 ? -1 : 0; + const modifier = offScheduleReleases.filter(v => i >= v).length; const date = getReleaseOfMonth( firstReleaseYear, - firstReleaseMonth + i + modifier, + firstReleaseMonth + i - modifier, ); return { version: `1.${i}.0`, date }; });