From eeb7eb0a30c9e2e0932ad1be26abae3c886c7f1a Mon Sep 17 00:00:00 2001
From: Jago de Vreede <jagodevreede@gmail.com>
Date: Mon, 11 Nov 2024 20:01:22 +0100
Subject: [PATCH] feat: Add native build for osx aarch64

---
 .github/workflows/assemble-native.yml           |  6 ++++--
 sdkman-ui/pom.xml                               |  6 +++---
 sdkman-ui/src/main/assembly/zip-osx-aarch64.xml | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 sdkman-ui/src/main/assembly/zip-osx-aarch64.xml

diff --git a/.github/workflows/assemble-native.yml b/.github/workflows/assemble-native.yml
index 014ebe7..9d085dd 100644
--- a/.github/workflows/assemble-native.yml
+++ b/.github/workflows/assemble-native.yml
@@ -16,13 +16,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-13, windows-latest ]
+        os: [ macos-13, macos-latest, windows-latest ]
         jdk_arch: [ x86_64, aarch64 ]
         exclude:
           - os: macos-13
             jdk_arch: aarch64
           - os: windows-latest
             jdk_arch: aarch64
+          - os: macos-latest
+            jdk_arch: x86_64
     # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
     runs-on: ${{ matrix.os }}
     steps:
@@ -65,7 +67,7 @@ jobs:
       - name: Remove windows lib
         if: startsWith(matrix.os, 'windows') != true
         # TODO remove this for oll other os as well
-        run: rm sdkman-ui/target/gluonfx/x86_64-darwin/gvm/lib/libjnidispatch.a
+        run: rm -f sdkman-ui/target/gluonfx/${{ matrix.jdk_arch }}-darwin/gvm/lib/libjnidispatch.a
       - name: Link native
         run: ./mvnw -B gluonfx:link -f sdkman-ui
       - name: Assemble zip
diff --git a/sdkman-ui/pom.xml b/sdkman-ui/pom.xml
index b27b3dd..54c9920 100644
--- a/sdkman-ui/pom.xml
+++ b/sdkman-ui/pom.xml
@@ -174,12 +174,12 @@
                         <version>${maven-assembly-plugin.version}</version>
                         <executions>
                             <execution>
-                                <id>make-zip-x86_64</id>
+                                <id>make-zip-${os.arch}</id>
                                 <configuration>
-                                    <finalName>sdkman-ui-osx_x86_64-${project.version}</finalName>
+                                    <finalName>sdkman-ui-osx_${os.arch}-${project.version}</finalName>
                                     <appendAssemblyId>false</appendAssemblyId>
                                     <descriptors>
-                                        <descriptor>src/main/assembly/zip-osx-x86_64.xml</descriptor>
+                                        <descriptor>src/main/assembly/zip-osx-${os.arch}.xml</descriptor>
                                     </descriptors>
                                 </configuration>
                             </execution>
diff --git a/sdkman-ui/src/main/assembly/zip-osx-aarch64.xml b/sdkman-ui/src/main/assembly/zip-osx-aarch64.xml
new file mode 100644
index 0000000..81be388
--- /dev/null
+++ b/sdkman-ui/src/main/assembly/zip-osx-aarch64.xml
@@ -0,0 +1,17 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>zip</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+    <files>
+        <file>
+            <source>${project.build.directory}/gluonfx/aarch64-darwin/sdkman-ui</source>
+            <outputDirectory>/</outputDirectory>
+            <destName>sdkman-ui</destName>
+        </file>
+    </files>
+</assembly>
\ No newline at end of file