Add support for LemMinX binary natively on MacOS aarch64.

- Bump graalvm/setup-graalvm to 1.1.6 and adapt to new parameters

Signed-off-by: Roland Grunberg <[email protected]>

Author: rgrunber

.github/workflows/native-image.yaml

@@ -21,15 +21,17 @@
       runs-on: ${{ matrix.os }}
       needs: setup-xml-version
       env:
-        GRAALVM_VERSION: 22.3.3
+        GRAALVM_DISTRO: graalvm
         GRAALVM_JAVA: 17
       strategy:
         fail-fast: true
         matrix:
-          os: [macos-latest, ubuntu-20.04]
+          os: [macos-latest, macos-14, ubuntu-20.04]
           include:
             - os: macos-latest
               label: 'osx-x86_64'
+            - os: macos-14
+              label: 'osx-aarch_64'
             - os: ubuntu-20.04
               label: 'linux'
       steps:
@@ -51,17 +53,16 @@
         uses: actions/cache@v2
         with:
           path: |
-            /opt/hostedtoolcache/graalvm-ce-*
-            ~/hostedtoolcache/graalvm-ce-*
-          key: ${{ runner.os }}-graalvm-${{env.GRAALVM_VERSION}}
+            /opt/hostedtoolcache/graalvm-jdk-*
+            ~/hostedtoolcache/graalvm-jdk-*
+          key: ${{ runner.os }}-graalvm-jdk-${{ env.GRAALVM_JAVA }}
           restore-keys: |
-            ${{ runner.os }}-graalvm-
-      - uses: graalvm/setup-graalvm@0e29e36dce77b07eb899abac809c2fce9d60c140 #v1.1.3.1
+            ${{ runner.os }}-graalvm-jdk-
+      - uses: graalvm/setup-graalvm@a1b47fdf04e772fed6b3b46131e226f9aea5e169 #v1.1.6
         with:
-          version: ${{env.GRAALVM_VERSION}}
+          distribution: ${{env.GRAALVM_DISTRO}}
           java-version: ${{env.GRAALVM_JAVA}}
       - run: ./mvnw -B package -Dnative -DskipTests $([ $(uname -s) = Linux ] && echo "-Dgraalvm.static=-H:+StaticExecutableWithDynamicLibC") -Dcbi.jarsigner.skip=true
-      - run: rm org.eclipse.lemminx/target/*.build_artifacts.txt
       - run: mv org.eclipse.lemminx/target/lemminx-* lemminx-${{ matrix.label }}
       - uses: actions/upload-artifact@v3
         with:
@@ -72,7 +73,7 @@
       runs-on: windows-latest
       needs: setup-xml-version
       env:
-        GRAALVM_VERSION: 22.3.3
+        GRAALVM_DISTRO: graalvm
         GRAALVM_JAVA: 17
       steps:
       - name: Check out LemMinX
@@ -95,18 +96,18 @@
         with:
           path: |
             C:\hostedtoolcache\windows\graalvm-ce-*
-          key: ${{ runner.os }}-graalvm-${{env.GRAALVM_VERSION}}
+          key: ${{ runner.os }}-graalvm-*
           restore-keys: |
             ${{ runner.os }}-graalvm-
       - uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d #v1.12.0
-      - uses: graalvm/setup-graalvm@0e29e36dce77b07eb899abac809c2fce9d60c140 #v1.1.3.1
+      - uses: graalvm/setup-graalvm@a1b47fdf04e772fed6b3b46131e226f9aea5e169 #v1.1.6
         with:
-          version: ${{env.GRAALVM_VERSION}}
+          distribution: ${{env.GRAALVM_DISTRO}}
           java-version: ${{env.GRAALVM_JAVA}}
       - run: .\mvnw.cmd -B package -Dnative -DskipTests -D "cbi.jarsigner.skip=true"
       - run: mv org.eclipse.lemminx\target\lemminx-*.exe lemminx-win32.exe
       - uses: actions/upload-artifact@v3
         with:
           name: lemminx-win32
           path: lemminx-win32.exe
-          if-no-files-found: error
+          if-no-files-found: error

.github/workflows/release.yml

@@ -116,7 +116,7 @@ jobs:
       - name: Prepare Binary Artifacts For Packaging
         run:  |
           mkdir -p ../staging/zips ../staging/checksums
-          for f in lemminx-linux lemminx-osx-x86_64 lemminx-win32; do
+          for f in lemminx-linux lemminx-osx-{x86_64,aarch_64} lemminx-win32; do
             pushd ${f}
             chmod u+x ${f}*
             zip ../../staging/zips/${f}.zip ${f}*
@@ -131,7 +131,7 @@ jobs:
           targets["linux-x64"]=linux
           targets["win32-x64"]=win32
           targets["darwin-x64"]=osx-x86_64
-          targets["darwin-arm64"]=osx-x86_64
+          targets["darwin-arm64"]=osx-aarch_64
           for tg in ${!targets[@]}; do
             cp ../staging/lemminx-${targets[${tg}]}* ./server
             cp ../staging/checksums/lemminx-${targets[${tg}]}.sha256 ./server