Use M1 runner to enable macOS GHA native build

jnr · Apr 5, 2022 · 108d7ac · 108d7ac
1 parent 5bd4cf8
commit 108d7ac
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/.github/workflows/native-macos.yml b/.github/workflows/native-macos.yml
@@ -1,29 +1,26 @@
 name: Build macOS Binaries
 
 on:
-#  push:
-#    branches: [ master ]
-#  pull_request:
-#    branches: [ master ]
-  # GHA does not support building Apple am64 very well, so we disable this workflow for now.
-  # See https://github.com/actions/runner/issues/805
   push:
-    branches-ignore:
-      - '**'
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   native:
 
-    runs-on: macos-latest
+    runs-on: [self-hosted, macos, aarch64]
 
     name: macOS binary
 
     steps:
       - uses: actions/checkout@v2
       - name: set up java ${{ matrix.java-version }}
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 8
+          architecture: arm
       - name: cache dependencies
         uses: actions/cache@v1
         with:
@@ -36,12 +33,12 @@ jobs:
         run: "rm archive/* && ant jar && ant archive-platform-jar"
       - name: Dump config.log
         if: ${{ always() }}
-        run: "cat /Users/runner/work/jffi/jffi/build/jni/libffi-darwin-x86_64/config.log"
+        run: "cat build/jni/libffi-darwin-x86_64/config.log"
       - name: Archive built library
         uses: actions/upload-artifact@v2
         with:
           name: shared-object
-          path: build/jni/*.so
+          path: build/jni/*.jnilib
       - name: Archive built jar
         uses: actions/upload-artifact@v2
         with: