Skip to content

Commit f758644

Browse files
committed
Cross-compile for arm64 for macos.
1 parent 583b98f commit f758644

1 file changed

Lines changed: 41 additions & 23 deletions

File tree

.circleci/config.yml

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ aliases:
1111
if [[ "${ELECTRON_VERSION}" ]]; then
1212
GYP_ARGS="--runtime=electron --target=${ELECTRON_VERSION} --dist-url=https://electronjs.org/headers"
1313
fi
14+
if [[ "${BUILD_ARM64}" == "true" ]]; then
15+
GYP_ARGS="${GYP_ARGS} --target_arch=arm64"
16+
fi
1417
./node_modules/.bin/node-pre-gyp rebuild package testpackage $GYP_ARGS
1518
1619
- &build-command-windows
@@ -102,7 +105,7 @@ aliases:
102105

103106
- &common-macos
104107
macos:
105-
xcode: "10.2.1"
108+
xcode: "13.1.0"
106109
steps:
107110
- checkout
108111
- run: |
@@ -130,12 +133,17 @@ aliases:
130133
node -v
131134
npm install --build-from-source
132135
- run: *build-command
133-
- run: npm run test
136+
- run:
137+
name: Run Tests
138+
command: |
139+
if [[ "${SKIP_TEST}" != "true" ]]; then
140+
npm run test
141+
fi
134142
- run: *publish-command
135143

136144
- &common-electron-macos
137145
macos:
138-
xcode: "10.2.1"
146+
xcode: "13.1.0"
139147
steps:
140148
- checkout
141149
- run: |
@@ -283,6 +291,15 @@ jobs:
283291
NODE_VERSION: "14.11.0"
284292
ELECTRON_VERSION: "11.2.3"
285293

294+
build-macos-14-arm64:
295+
<<: *common-macos
296+
environment:
297+
PUBLISH: true
298+
NODE_VERSION: "14.11.0"
299+
ELECTRON_VERSION: "11.2.3"
300+
BUILD_ARM64: true
301+
SKIP_TEST: true
302+
286303
build-macos-12:
287304
<<: *common-macos
288305
environment:
@@ -365,24 +382,25 @@ workflows:
365382
version: 2
366383
build_all:
367384
jobs:
368-
- build-14
369-
- build-12
370-
- build-10
371-
- build-electron-11
372-
# - build-electron-10 # Segfaults on electron-mocha
373-
- build-electron-9
374-
- build-electron-8
375-
- build-electron-7
376-
- build-electron-6
385+
# - build-14
386+
# - build-12
387+
# - build-10
388+
# - build-electron-11
389+
# # - build-electron-10 # Segfaults on electron-mocha
390+
# - build-electron-9
391+
# - build-electron-8
392+
# - build-electron-7
393+
# - build-electron-6
394+
- build-macos-14-arm64
377395
- build-macos-14
378-
- build-macos-12
379-
- build-macos-10
380-
- build-macos-electron-11
381-
# - build-macos-electron-10 # Segfaults on electron-mocha
382-
- build-macos-electron-9
383-
- build-macos-electron-8
384-
- build-macos-electron-7
385-
- build-macos-electron-6
386-
- windows-14_x86
387-
- windows-14_x64
388-
- windows-14_arm64
396+
# - build-macos-12
397+
# - build-macos-10
398+
# - build-macos-electron-11
399+
# # - build-macos-electron-10 # Segfaults on electron-mocha
400+
# - build-macos-electron-9
401+
# - build-macos-electron-8
402+
# - build-macos-electron-7
403+
# - build-macos-electron-6
404+
# - windows-14_x86
405+
# - windows-14_x64
406+
# - windows-14_arm64

0 commit comments

Comments
 (0)