Skip to content

Commit db88ff2

Browse files
committed
Use M1 runner to enable macOS GHA native build
1 parent 5bd4cf8 commit db88ff2

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

.github/workflows/native-macos.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
name: Build macOS Binaries
22

33
on:
4-
# push:
5-
# branches: [ master ]
6-
# pull_request:
7-
# branches: [ master ]
8-
# GHA does not support building Apple am64 very well, so we disable this workflow for now.
9-
# See https://github.com/actions/runner/issues/805
104
push:
11-
branches-ignore:
12-
- '**'
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
138

149
jobs:
1510
native:
1611

17-
runs-on: macos-latest
12+
runs-on: [self-hosted, macos, aarch64]
1813

1914
name: macOS binary
2015

@@ -24,6 +19,7 @@ jobs:
2419
uses: actions/[email protected]
2520
with:
2621
java-version: 8
22+
architecture: arm
2723
- name: cache dependencies
2824
uses: actions/cache@v1
2925
with:
@@ -36,12 +32,12 @@ jobs:
3632
run: "rm archive/* && ant jar && ant archive-platform-jar"
3733
- name: Dump config.log
3834
if: ${{ always() }}
39-
run: "cat /Users/runner/work/jffi/jffi/build/jni/libffi-darwin-x86_64/config.log"
35+
run: "cat build/jni/libffi-darwin-x86_64/config.log"
4036
- name: Archive built library
4137
uses: actions/upload-artifact@v2
4238
with:
4339
name: shared-object
44-
path: build/jni/*.so
40+
path: build/jni/*.jnilib
4541
- name: Archive built jar
4642
uses: actions/upload-artifact@v2
4743
with:

0 commit comments

Comments
 (0)