Adding MacOS M1 support.

s22s · Mar 14, 2024 · 6ac0e6a · 6ac0e6a
1 parent d15bb37
commit 6ac0e6a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,15 +6,18 @@ on:
   push:
     branches: ['main']
     tags: [v*]
+  workflow_dispatch:
+
   # release:
     # types: [published]
 
 jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        java: [8]
+        # Specifying `macos-14` is the way to get aarch64
+        os: [ubuntu-latest, macos-12, macos-14]
+        java: [11]
         distribution: [temurin]
         pdal: [2.6.3]
     runs-on: ${{ matrix.os }}
@@ -32,6 +35,9 @@ jobs:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
 
+      - run: brew install sbt
+        if: ${{ matrix.os ==  'macos-14') }}
+
       - uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: pdal-java
@@ -71,7 +77,7 @@ jobs:
         if: ${{ startsWith(matrix.os, 'macos') }}
         with:
           name: macos
-          path: native/target/native/x86_64-darwin/bin
+          path: native/target/native/${{ runner.arch }}-darwin/bin
 
   publish:
     strategy:
@@ -132,7 +138,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: macos
-          path: native/target/native/x86_64-darwin/bin
+          path: native/target/native/${{ runner.arch }}-darwin/bin
 
       - name: Release
         run: sbt ci-release