Merge pull request #24015 from brianphillips/fix-release-schedule-message

Fix automated release schedule message for releases >= 1.26

scripts/generate-merge-message.js

@@ -57,10 +57,18 @@ 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) => {
-      const date = getReleaseOfMonth(firstReleaseYear, firstReleaseMonth + i);
+      const modifier = offScheduleReleases.filter(v => i >= v).length;
+      const date = getReleaseOfMonth(
+        firstReleaseYear,
+        firstReleaseMonth + i - modifier,
+      );
       return { version: `1.${i}.0`, date };
     });
 }