Merge pull request #157 from gsmet/previous-branch-lts

Make sure the previous branch also has the LTS suffix in email

src/main/java/io/quarkus/bot/release/step/CreateBranch.java

@@ -275,12 +275,12 @@ private static String getBranchEmail(ReleaseInformation releaseInformation, Stri
                 + "\n"
                 + "- for anything required in " + releaseInformation.getFullBranch() + " (currently open pull requests included), please add the " + Labels.BACKPORT_LABEL + " label\n";
 
-        email += "- for fixes we also want in future " + previousMinorBranch + ", please add the " + Labels.backportForVersion(previousMinorBranch) + " label\n";
+        email += "- for fixes we also want in future " + Branches.getFullBranch(previousMinorBranch) + ", please add the " + Labels.backportForVersion(previousMinorBranch) + " label\n";
 
         for (String ltsBranch : Branches.getLtsVersionsReleasedBefore(previousMinorBranch).reversed()) {
             // 2.13 is not an official LTS so we have to special case it
-            email += "- for fixes we also want in future " + ltsBranch
-                    + (Branches.BRANCH_2_13.equals(ltsBranch) ? "" : " LTS") + ", please add the " + Labels.backportForVersion(ltsBranch)
+            email += "- for fixes we also want in future "
+                    + (Branches.BRANCH_2_13.equals(ltsBranch) ? ltsBranch : Branches.getFullBranch(ltsBranch)) + ", please add the " + Labels.backportForVersion(ltsBranch)
                     + " label\n";
         }
 

src/main/java/io/quarkus/bot/release/util/Branches.java

@@ -49,6 +49,14 @@ public static List<String> getLtsVersionsReleasedBefore(String version) {
                 .toList();
     }
 
+    public static String getFullBranch(String branch) {
+        if (isLts(branch)) {
+            return branch + " LTS";
+        }
+
+        return branch;
+    }
+
     private Branches() {
     }
 }