Skip to content

Commit f032785

Browse files
skeet70leeroy-travisBobWall23
authored
Attempt to get the build running on our m1 machine (#80)
* Attempt to get the build running on our m1 machine * bump-version: Set release version 0.8.2-pre.5 * Try `runs-on` instead of `os` * Rever change * Add CI that runs on our box * Use target in ci compile * Node 12 and 14 don't support arm64 * Don't run the cross compile unneccessarily * Recursive definition? * Non-recursive definition * Maybe the full object is required to match? * Maybe it has to be done as in include * Forgot to remove matrix entry when including * Try list in include to reduce duplication * Have to enumerate * Don't need mac docker tests Co-authored-by: Leeroy Travis <ops@ironcorelabs.com> Co-authored-by: Bob Wall <bob.wall@ironcorelabs.com>
1 parent 6444568 commit f032785

File tree

3 files changed

+50
-9
lines changed

3 files changed

+50
-9
lines changed

.github/typescript-ci-patch.yaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,27 @@
1313
system:
1414
- os: macos-10.15
1515
target: x86_64-apple-darwin
16-
- os: macos-11
17-
target: aarch64-apple-darwin
1816
- os: ubuntu-20.04
1917
target: x86_64-unknown-linux-gnu
2018
- os: windows-2019
2119
target: x86_64-pc-windows-msvc
20+
include:
21+
# only node 15+ supports arm64 natively, so we only need to build 16 for now
22+
- system:
23+
os: [self-hosted, macOS, ARM64]
24+
target: aarch64-apple-darwin
25+
node_version: 16
26+
rust_version: 1.56.0
27+
- system:
28+
os: [self-hosted, macOS, ARM64]
29+
target: aarch64-apple-darwin
30+
node_version: 16
31+
rust_version: stable
32+
- system:
33+
os: [self-hosted, macOS, ARM64]
34+
target: aarch64-apple-darwin
35+
node_version: 16
36+
rust_version: beta
2237
- op: add
2338
path: /jobs/test/strategy/fail-fast
2439
value: false
@@ -58,6 +73,8 @@
5873
path: /jobs/test-docker
5974
- op: remove
6075
path: /jobs/test-docker/strategy/matrix/system
76+
- op: remove
77+
path: /jobs/test-docker/strategy/matrix/include
6178
- op: add
6279
path: /jobs/test-docker/strategy/matrix/os
6380
value:

.github/workflows/publish.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ jobs:
2727
system:
2828
- os: macos-10.15
2929
target: x86_64-apple-darwin
30-
- os: macos-11
31-
target: aarch64-apple-darwin
32-
# only needed in this case, where we're cross compiling until runners with m1 chips exist
33-
pre_gyp_platform: darwin
34-
pre_gyp_arch: arm64
3530
- os: ubuntu-20.04
3631
target: x86_64-unknown-linux-gnu
3732
- os: windows-2019
3833
target: x86_64-pc-windows-msvc
34+
include:
35+
# only node 15+ supports arm64 natively, so we only need to build 16 for now
36+
- system:
37+
os: [self-hosted, macOS, ARM64]
38+
target: aarch64-apple-darwin
39+
node_version: 16
3940
steps:
4041
- uses: actions/checkout@v2
4142
with:

.github/workflows/typescript-ci.yaml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,35 @@ jobs:
2525
system:
2626
- os: macos-10.15
2727
target: x86_64-apple-darwin
28-
- os: macos-11
29-
target: aarch64-apple-darwin
3028
- os: ubuntu-20.04
3129
target: x86_64-unknown-linux-gnu
3230
- os: windows-2019
3331
target: x86_64-pc-windows-msvc
32+
include:
33+
- system:
34+
os:
35+
- self-hosted
36+
- macOS
37+
- ARM64
38+
target: aarch64-apple-darwin
39+
node_version: 16
40+
rust_version: 1.56.0
41+
- system:
42+
os:
43+
- self-hosted
44+
- macOS
45+
- ARM64
46+
target: aarch64-apple-darwin
47+
node_version: 16
48+
rust_version: stable
49+
- system:
50+
os:
51+
- self-hosted
52+
- macOS
53+
- ARM64
54+
target: aarch64-apple-darwin
55+
node_version: 16
56+
rust_version: beta
3457
fail-fast: false
3558
steps:
3659
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)