Merge pull request #88 from gsmet/lts

Handle LTS releases
quarkusio · Mar 7, 2024 · 6289624 · 6289624
2 parents 4c64604 + 0cb19c7
commit 6289624
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 6 deletions.
diff --git a/src/main/java/io/quarkus/bot/release/step/AnnounceRelease.java b/src/main/java/io/quarkus/bot/release/step/AnnounceRelease.java
@@ -19,6 +19,7 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.bot.release.ReleaseInformation;
 import io.quarkus.bot.release.ReleaseStatus;
+import io.quarkus.bot.release.util.Branches;
 import io.quarkus.bot.release.util.Repositories;
 import io.quarkus.bot.release.util.UpdatedIssueBody;
 import io.quarkus.bot.release.util.Versions;
@@ -43,9 +44,13 @@ public int run(Context context, Commands commands, GitHub quarkusBotGitHub, Rele
         comment.append("to trigger the performance evaluation testing for this release.\n\n");
 
         if (releaseInformation.isFinal()) {
-            comment.append("Then it is time to write the announcement:\n\n");
+            comment.append("Then it is time to announce the release:\n\n");
             if (!releaseInformation.isMaintenance()) {
-                comment.append("* Update the versions in `_data/versions.yaml`\n");
+                comment.append("* Update the versions of the website in [`_data/versions.yaml`](https://github.com/quarkusio/quarkusio.github.io/blob/develop/_data/versions.yaml)\n");
+            }
+            if (Branches.isLts(releaseInformation.getBranch())) {
+                comment.append(
+                        "* This is a LTS version so make sure the version is referenced in the `documentation:` section of [`_data/versions.yaml`](https://github.com/quarkusio/quarkusio.github.io/blob/develop/_data/versions.yaml)\n");
             }
             comment.append("* Write a blog post for [the website](https://github.com/quarkusio/quarkusio.github.io)\n");
             comment.append(

diff --git a/src/main/java/io/quarkus/bot/release/step/ApproveCoreRelease.java b/src/main/java/io/quarkus/bot/release/step/ApproveCoreRelease.java
@@ -14,6 +14,7 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.bot.release.ReleaseInformation;
 import io.quarkus.bot.release.ReleaseStatus;
+import io.quarkus.bot.release.util.Branches;
 import io.quarkus.bot.release.util.Command;
 import io.quarkus.bot.release.util.Jdks;
 import io.quarkus.bot.release.util.Outputs;
@@ -39,7 +40,9 @@ public boolean shouldPause(Context context, Commands commands, GitHub quarkusBot
             comment.append("- :bulb: We detected that this `" + releaseInformation.getVersion() + "` release will be the first final as `"
                     + Versions.getDot0(releaseInformation.getVersion()) + "` has not been fully released\n");
         }
-        if (releaseInformation.isMaintenance()) {
+        if (Branches.isLts(releaseInformation.getBranch())) {
+            comment.append("- This is a `LTS` release.\n");
+        } else if (releaseInformation.isMaintenance()) {
             comment.append("- This is a `maintenance` release.\n");
         }
         if (!releaseInformation.isFinal()) {

diff --git a/src/main/java/io/quarkus/bot/release/step/CreateBranch.java b/src/main/java/io/quarkus/bot/release/step/CreateBranch.java
@@ -243,6 +243,10 @@ private static String getBranchEmail(ReleaseInformation releaseInformation, Stri
                 + "- for fixes we also want in future " + previousMinorBranch + ", please add the triage/backport-" + previousMinorBranch + "? label\n";
 
         for (String ltsBranch : Branches.LTS_BRANCHES) {
+            if (ltsBranch.equals(releaseInformation.getBranch())) {
+                continue;
+            }
+
             email += "- for fixes we also want in future " + ltsBranch + ", please add the triage/backport-" + ltsBranch + "? label\n";
         }
 

diff --git a/src/main/java/io/quarkus/bot/release/step/UpdateDocumentation.java b/src/main/java/io/quarkus/bot/release/step/UpdateDocumentation.java
@@ -14,6 +14,7 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.bot.release.ReleaseInformation;
 import io.quarkus.bot.release.ReleaseStatus;
+import io.quarkus.bot.release.util.Branches;
 import io.quarkus.bot.release.util.Processes;
 import io.quarkus.bot.release.util.UpdatedIssueBody;
 
@@ -27,6 +28,17 @@ public class UpdateDocumentation implements StepHandler {
     @Override
     public int run(Context context, Commands commands, GitHub quarkusBotGitHub, ReleaseInformation releaseInformation,
             ReleaseStatus releaseStatus, GHIssue issue, UpdatedIssueBody updatedIssueBody) throws IOException, InterruptedException {
-        return processes.execute(List.of("./update-docs.sh"));
+        int status = processes.execute(List.of("./update-docs.sh"));
+
+        if (status != 0) {
+            return status;
+        }
+
+        // for LTS releases that are not maintenance release yet, we also push the version in a versioned directory
+        if (Branches.isLts(releaseInformation.getBranch()) && !releaseInformation.isMaintenance()) {
+            status = processes.execute(List.of("./update-docs.sh", releaseInformation.getBranch()));
+        }
+
+        return status;
     }
 }
diff --git a/src/main/java/io/quarkus/bot/release/step/UpdateQuickstarts.java b/src/main/java/io/quarkus/bot/release/step/UpdateQuickstarts.java
@@ -14,6 +14,7 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.bot.release.ReleaseInformation;
 import io.quarkus.bot.release.ReleaseStatus;
+import io.quarkus.bot.release.util.Branches;
 import io.quarkus.bot.release.util.Processes;
 import io.quarkus.bot.release.util.UpdatedIssueBody;
 
@@ -27,7 +28,18 @@ public class UpdateQuickstarts implements StepHandler {
     @Override
     public int run(Context context, Commands commands, GitHub quarkusBotGitHub, ReleaseInformation releaseInformation,
             ReleaseStatus releaseStatus, GHIssue issue, UpdatedIssueBody updatedIssueBody) throws IOException, InterruptedException {
-        return processes.execute(List.of("./update-quickstarts.sh"));
+        int status = processes.execute(List.of("./update-quickstarts.sh"));
+
+        if (status != 0) {
+            return status;
+        }
+
+        // for LTS releases that are not maintenance release yet, we also push the version in a branch
+        if (Branches.isLts(releaseInformation.getBranch()) && !releaseInformation.isMaintenance()) {
+            status = processes.execute(List.of("./update-quickstarts.sh", releaseInformation.getBranch()));
+        }
+
+        return status;
     }
 
     @Override

diff --git a/src/main/java/io/quarkus/bot/release/util/Branches.java b/src/main/java/io/quarkus/bot/release/util/Branches.java
@@ -7,7 +7,7 @@
 public class Branches {
 
     public static final String MAIN = "main";
-    public static final List<String> LTS_BRANCHES = List.of("3.2", "2.13");
+    public static final List<String> LTS_BRANCHES = List.of("3.8", "3.2", "2.13");
 
     public static String getPlatformPreparationBranch(ReleaseInformation releaseInformation) {
         if (releaseInformation.isFinal() && !releaseInformation.isFirstFinal()) {
@@ -25,6 +25,10 @@ public static String getPlatformReleaseBranch(ReleaseInformation releaseInformat
         return MAIN;
     }
 
+    public static boolean isLts(String branch) {
+        return LTS_BRANCHES.contains(branch);
+    }
+
     private Branches() {
     }
 }
diff --git a/src/test/java/io/quarkus/bot/release/BranchesTest.java b/src/test/java/io/quarkus/bot/release/BranchesTest.java
@@ -33,4 +33,14 @@ void testBugfixFinalRelease() {
         assertThat(Branches.getPlatformPreparationBranch(releaseInformation)).isEqualTo("3.6");
         assertThat(Branches.getPlatformReleaseBranch(releaseInformation)).isEqualTo("3.6");
     }
+
+    @Test
+    void testLts() {
+        assertThat(Branches.isLts("2.13")).isTrue();
+        assertThat(Branches.isLts("2.14")).isFalse();
+        assertThat(Branches.isLts("3.2")).isTrue();
+        assertThat(Branches.isLts("3.4")).isFalse();
+        assertThat(Branches.isLts("3.8")).isTrue();
+        assertThat(Branches.isLts("3.9")).isFalse();
+    }
 }