Make the Windows artifact version also include the release of the bui…

…ld (#763)
project-ncl · Feb 3, 2025 · 5451134 · 5451134
1 parent a20d095
commit 5451134
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/java/org/jboss/pnc/deliverablesanalyzer/model/FinderResultCreator.java b/src/main/java/org/jboss/pnc/deliverablesanalyzer/model/FinderResultCreator.java
@@ -53,6 +53,7 @@
 
 import com.redhat.red.build.koji.model.xmlrpc.KojiArchiveInfo;
 import com.redhat.red.build.koji.model.xmlrpc.KojiBtype;
+import com.redhat.red.build.koji.model.xmlrpc.KojiBuildInfo;
 
 import jakarta.ws.rs.BadRequestException;
 
@@ -153,10 +154,12 @@ private static void setCommonArtifactFields(ArtifactBuilder<?, ?> builder, KojiL
         return NPMArtifact.builder().name(archiveInfo.getArtifactId()).version(archiveInfo.getVersion());
     }
 
-    private static WindowsArtifactBuilder<?, ?> createWindowsArtifact(KojiArchiveInfo archiveInfo) {
+    private static WindowsArtifactBuilder<?, ?> createWindowsArtifact(
+            KojiBuildInfo buildInfo,
+            KojiArchiveInfo archiveInfo) {
         return WindowsArtifact.builder()
                 .name(archiveInfo.getArtifactId())
-                .version(archiveInfo.getVersion())
+                .version(String.join("-", archiveInfo.getVersion(), buildInfo.getRelease()))
                 .platforms(archiveInfo.getPlatforms())
                 .flags(archiveInfo.getFlags());
     }
@@ -238,13 +241,17 @@ private static Build createBuild(
         return builder.isImport(kojiBuild.isImport()).artifacts(artifacts).build();
     }
 
-    private static Artifact createArtifact(KojiLocalArchive localArchive, BuildSystem buildSystem, boolean imported) {
+    private static Artifact createArtifact(
+            KojiBuildInfo buildInfo,
+            KojiLocalArchive localArchive,
+            BuildSystem buildSystem,
+            boolean imported) {
         KojiArchiveInfo archiveInfo = localArchive.getArchive();
         KojiBtype buildType = archiveInfo.getBuildType();
         ArtifactBuilder<?, ?> builder = switch (buildType) {
             case maven -> createMavenArtifact(archiveInfo);
             case npm -> createNpmArtifact(archiveInfo);
-            case win -> createWindowsArtifact(archiveInfo);
+            case win -> createWindowsArtifact(buildInfo, archiveInfo);
             default -> throw new BadRequestException(
                     "Unhandled build type " + buildType + " for local archive " + localArchive);
         };
@@ -301,6 +308,7 @@ private static Set<Build> getFoundBuilds(Map<BuildSystemInteger, KojiBuild> buil
 
             for (KojiLocalArchive localArchive : localArchives) {
                 Artifact artifact = createArtifact(
+                        kojiBuild.getBuildInfo(),
                         localArchive,
                         buildSystemInteger.getBuildSystem(),
                         kojiBuild.isImport());