From 6f17dd6ff58959ae82b83fb834d6ac7cd5ee4822 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Thu, 19 Dec 2024 15:00:40 +0200
Subject: [PATCH] Align artifact name with what GraalVM CE generates in its
 releases

Closes: https://github.com/graalvm/mandrel-packaging/issues/452
---
 build.java                           | 2 +-
 jenkins/jobs/builds/Constants.groovy | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.java b/build.java
index 72c6bca..8d65595 100644
--- a/build.java
+++ b/build.java
@@ -255,7 +255,7 @@ public static void main(String... args) throws IOException
         if (options.archiveSuffix != null)
         {
             int javaMajor = Runtime.version().feature();
-            String archiveName = "mandrel-java" + javaMajor + "-" + PLATFORM + "-" + mandrelVersionUntilSpace + "." + options.archiveSuffix;
+            String archiveName = "mandrel-java" + javaMajor + "-" + PLATFORM.replace("darwin", "macos") + "-" + mandrelVersionUntilSpace + "." + options.archiveSuffix;
             logger.info("Creating Archive " + archiveName);
             createArchive(fs, os, mandrelHome, archiveName);
         }
diff --git a/jenkins/jobs/builds/Constants.groovy b/jenkins/jobs/builds/Constants.groovy
index 02e928c..4f74088 100644
--- a/jenkins/jobs/builds/Constants.groovy
+++ b/jenkins/jobs/builds/Constants.groovy
@@ -78,7 +78,8 @@ class Constants {
         mv ${JAVA_HOME}/lib/static/darwin-arm64 ${JAVA_HOME}/lib/static/darwin-aarch64
     fi
     ./jenkins/jobs/scripts/mandrel_linux_build.sh
-    # We align to what GraalVM CE calls its releases:
+    # We align to what GraalVM CE calls its releases
+    # this is no longer needed as of mandrel-packaging 24.2, but we keep it for backwards compatibility:
     for m in mandrel-*.tar.gz*;do n=$(echo $m | sed 's/darwin-aarch64/macos-aarch64/g'); mv $m $n;done
     find .
     '''