Fix -ci suffix removal

JabRef · Mar 6, 2020 · 60ff83a · 60ff83a
1 parent 289142f
commit 60ff83a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/org/jabref/logic/util/Version.java b/src/main/java/org/jabref/logic/util/Version.java
@@ -29,7 +29,7 @@ public class Version {
     private static final Version UNKNOWN_VERSION = new Version();
 
     private final static Pattern VERSION_PATTERN = Pattern.compile("(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?<stage>-alpha|-beta)?(?<dev>-?dev)?.*");
-    private final static Pattern CI_SUFFIX_PATTERN = Pattern.compile("-ci\\.\\d+$");
+    private final static Pattern CI_SUFFIX_PATTERN = Pattern.compile("-ci\\.\\d+");
 
     private static final String JABREF_GITHUB_RELEASES = "https://api.github.com/repos/JabRef/JabRef/releases";
 

diff --git a/src/test/java/org/jabref/logic/util/VersionTest.java b/src/test/java/org/jabref/logic/util/VersionTest.java
@@ -288,4 +288,10 @@ public void ciSuffixShouldBeRemoved() {
         Version v50ci = Version.parse("5.0-ci.1");
         assertEquals("5.0", v50ci.getFullVersion());
     }
+
+    @Test
+    public void ciSuffixShouldBeRemovedIfDateIsPresent() {
+        Version v50ci = Version.parse("5.0-ci.1--2020-03-06--289142f");
+        assertEquals("5.0--2020-03-06--289142f", v50ci.getFullVersion());
+    }
 }