Align artifact name with what GraalVM CE generates in its releases

Closes: #452
graalvm · Dec 19, 2024 · 8c9b0dc · 8c9b0dc
1 parent 148e035
commit 8c9b0dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 .
     '''