Merge pull request #440 from gsmet/backport-prs

Handle prefixing backport PRs correctly
quarkusio · Apr 16, 2024 · a8e5866 · a8e5866
2 parents 0e64c18 + c015858
commit a8e5866
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/io/quarkus/bot/util/GHPullRequests.java b/src/main/java/io/quarkus/bot/util/GHPullRequests.java
@@ -7,7 +7,7 @@
 
 public final class GHPullRequests {
 
-    private static final Pattern CLEAN_VERSION_PATTERN = Pattern.compile("^\\[?\\(?[0-9]+\\.[0-9]+\\]?\\)?[ -]*");
+    private static final Pattern CLEAN_VERSION_PATTERN = Pattern.compile("^\\[?\\(?[0-9]+\\.[0-9]+\\]?\\)?(?!\\.)[ -]*");
 
     public static boolean hasLabel(GHPullRequest pullRequest, String labelName) {
         for (GHLabel label : pullRequest.getLabels()) {

diff --git a/src/test/java/io/quarkus/bot/it/util/GHPullRequestsTest.java b/src/test/java/io/quarkus/bot/it/util/GHPullRequestsTest.java
@@ -26,6 +26,7 @@ public void testNormalizeTitle() {
         assertThat(GHPullRequests.normalizeTitle("My PR", "3.10")).isEqualTo(("[3.10] My PR"));
         assertThat(GHPullRequests.normalizeTitle("My PR", "main")).isEqualTo(("My PR"));
         assertThat(GHPullRequests.normalizeTitle("(3.8) My PR", "main")).isEqualTo(("(3.8) My PR"));
+        assertThat(GHPullRequests.normalizeTitle("3.8.4 backports 1", "3.8")).isEqualTo(("[3.8] 3.8.4 backports 1"));
         assertThat(GHPullRequests.normalizeTitle("(3.10) My PR", "3.10")).isEqualTo(("[3.10] My PR"));
         assertThat(GHPullRequests.normalizeTitle("[3.8] My PR", "main")).isEqualTo(("[3.8] My PR"));
         assertThat(GHPullRequests.normalizeTitle("[3.8] My PR", "3.8")).isEqualTo(("[3.8] My PR"));