fix(assemble): Apply replaced platform to working directories and res…

…olved image names Fixes #1642
jreleaser · Apr 26, 2024 · a8c7f27 · a8c7f27
1 parent 17f36d7
commit a8c7f27
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/core/jreleaser-engine/src/main/java/org/jreleaser/assemblers/JlinkAssemblerProcessor.java b/core/jreleaser-engine/src/main/java/org/jreleaser/assemblers/JlinkAssemblerProcessor.java
@@ -172,6 +172,7 @@ protected void doAssemble(TemplateContext props) throws AssemblerProcessingExcep
             if (!targetJdk.isActiveAndSelected()) continue;
 
             String platform = targetJdk.getPlatform();
+            String platformReplaced = assembler.getPlatform().applyReplacements(platform);
             Path platformJarsDirectory = jarsDirectory.resolve(platform);
             context.getLogger().debug(RB.$("assembler.copy.jars"), context.relativizeToBasedir(platformJarsDirectory));
             copyJars(context, assembler, platformJarsDirectory, platform);

diff --git a/core/jreleaser-engine/src/main/java/org/jreleaser/assemblers/JpackageAssemblerProcessor.java b/core/jreleaser-engine/src/main/java/org/jreleaser/assemblers/JpackageAssemblerProcessor.java
@@ -75,9 +75,10 @@ protected void doAssemble(TemplateContext props) throws AssemblerProcessingExcep
         }
 
         String platform = packager.getJdk().getPlatform();
+        String platformReplaced = assembler.getPlatform().applyReplacements(platform);
 
         Path assembleDirectory = props.get(Constants.KEY_DISTRIBUTION_ASSEMBLE_DIRECTORY);
-        Path workDirectory = assembleDirectory.resolve(WORK_DIRECTORY + "-" + platform);
+        Path workDirectory = assembleDirectory.resolve(WORK_DIRECTORY + "-" + platformReplaced);
         Path inputsDirectory = workDirectory.resolve(INPUTS_DIRECTORY);
         Path filesDirectory = inputsDirectory.resolve(FILES_DIRECTORY);
 

diff --git a/...releaser-engine/src/main/java/org/jreleaser/assemblers/NativeImageAssemblerProcessor.java b/...releaser-engine/src/main/java/org/jreleaser/assemblers/NativeImageAssemblerProcessor.java
@@ -72,6 +72,7 @@ protected void doAssemble(TemplateContext props) throws AssemblerProcessingExcep
         context.getLogger().debug(RB.$("assembler.graal.graal"), graalVersion, graalPath.toAbsolutePath().toString());
 
         String platform = assembler.getGraal().getPlatform();
+        String platformReplaced = assembler.getPlatform().applyReplacements(platform);
         // copy jars to assembly
         Path assembleDirectory = props.get(Constants.KEY_DISTRIBUTION_ASSEMBLE_DIRECTORY);
         Path jarsDirectory = assembleDirectory.resolve(JARS_DIRECTORY);

diff --git a/...ain/java/org/jreleaser/model/internal/validation/assemble/JpackageAssemblerValidator.java b/...ain/java/org/jreleaser/model/internal/validation/assemble/JpackageAssemblerValidator.java
@@ -92,6 +92,8 @@ private static void validateJpackage(JReleaserContext context, Mode mode, Jpacka
         JpackageAssembler.ApplicationPackage applicationPackage = assembler.getApplicationPackage();
         packager.enable();
 
+        assembler.setPlatform(assembler.getPlatform().mergeValues(context.getModel().getPlatform()));
+
         boolean hasJavaArchive = false;
         if (isNotBlank(assembler.getJlink())) {
             JlinkAssembler jlink = context.getModel().getAssemble().findJlink(assembler.getJlink());
@@ -108,9 +110,10 @@ private static void validateJpackage(JReleaserContext context, Mode mode, Jpacka
                 if (!context.isPlatformSelected(targetJdk)) continue;
 
                 String platform = targetJdk.getPlatform();
+                String platformReplaced = assembler.getPlatform().applyReplacements(platform);
                 Path path = baseOutputDirectory
                     .resolve("work-" + platform)
-                    .resolve(imageName + "-" + platform)
+                    .resolve(imageName + "-" + platformReplaced)
                     .toAbsolutePath();
                 candidateRuntimeImages.add(Artifact.of(path, platform));
             }