Fix version files when generating release notes (#85264)

Closes #85227. The git label version filter didn't take into account snapshot versions. Now it does.
elastic · Mar 23, 2022 · 19e1e43 · 19e1e43
1 parent f7138ac
commit 19e1e43
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...nal/src/main/java/org/elasticsearch/gradle/internal/release/GenerateReleaseNotesTask.java b/...nal/src/main/java/org/elasticsearch/gradle/internal/release/GenerateReleaseNotesTask.java
@@ -179,7 +179,10 @@ static Map<QualifiedVersion, Set<File>> partitionFilesByVersion(
 
         final List<QualifiedVersion> earlierVersions = gitWrapper.listVersions(tagWildcard)
             // Only keep earlier versions, and if `currentVersion` is a prerelease, then only prereleases too.
-            .filter(each -> each.isBefore(currentVersion) && (currentVersion.hasQualifier() == each.hasQualifier()))
+            .filter(
+                each -> each.isBefore(currentVersion)
+                    && (currentVersion.isSnapshot() || (currentVersion.hasQualifier() == each.hasQualifier()))
+            )
             .sorted(naturalOrder())
             .toList();