Make the Windows artifact version also include the release of the build

project-ncl · Feb 3, 2025 · df6b397 · df6b397
1 parent a20d095
commit df6b397
Showing 1 changed file with 6 additions and 5 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
@@ -31,6 +31,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.redhat.red.build.koji.model.xmlrpc.KojiBuildInfo;
 import org.jboss.pnc.api.deliverablesanalyzer.dto.Artifact;
 import org.jboss.pnc.api.deliverablesanalyzer.dto.Build;
 import org.jboss.pnc.api.deliverablesanalyzer.dto.BuildSystemType;
@@ -153,10 +154,10 @@ 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 +239,13 @@ 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);
         };
@@ -300,7 +301,7 @@ private static Set<Build> getFoundBuilds(Map<BuildSystemInteger, KojiBuild> buil
             Set<Artifact> artifacts = new HashSet<>();
 
             for (KojiLocalArchive localArchive : localArchives) {
-                Artifact artifact = createArtifact(
+                Artifact artifact = createArtifact(kojiBuild.getBuildInfo(),
                         localArchive,
                         buildSystemInteger.getBuildSystem(),
                         kojiBuild.isImport());